Commit Graph

988 Commits

Author SHA1 Message Date
The0bserver
b91df1403e The lack of recevier. It is the opposite of funny! 2021-01-14 01:31:58 -05:00
The0bserver
e01c57c832 Show me the opposite of funny! 2021-01-14 01:12:53 -05:00
The0bserver
1b469bdfda The power of overwriting... 2021-01-14 01:03:48 -05:00
The0bserver
d957c1d105 another tweak 2021-01-14 00:02:32 -05:00
The0bserver
ffe401544c First wave of fixing 2021-01-13 23:35:37 -05:00
The0bserver
55cd69746d A change in tact, perhaps? 2021-01-13 23:08:05 -05:00
The0bserver
2b8b9086ec Revert "Initial Commit:Goodbye rifle! You won't be missed!"
This reverts commit 1836d0106a.
2021-01-13 22:14:36 -05:00
The0bserver
1836d0106a Initial Commit:Goodbye rifle! You won't be missed! 2021-01-13 21:42:08 -05:00
Hatterhat
cb40ad4764 atomization is cowardice actually 2021-01-12 16:08:17 -06:00
necromanceranne
6d10ca9efa Fixes missing sprites on the steelwood bokkens, fixes further problems with crafting bokken parts 2021-01-10 05:43:33 +11:00
necromanceranne
0fda694a52 A bunch of fixes for bokkens, renamed all references to 'ironwood' to 'steelwood', since I got confused. 2021-01-04 15:30:28 +11:00
silicons
4c6cc24343 Merge pull request #13948 from necromanceranne/sheath_stuff
Bokken and Bokken Accessories: Bonkvengeance
2021-01-03 18:18:29 -07:00
necromanceranne
6a247e2a68 Adds a new version of bokken, cleans up some unnecessary code, completely redoes several bokken related sprites 2021-01-02 04:26:39 +11:00
necromanceranne
0aa5338f9b Adds wakibokken, puts bokken crafting into the craft menu, makes proper bokken a little harder to make but obviously an upgrade, makes crafted katanas and bokken have actual belt overlays 2021-01-01 05:42:28 +11:00
silicons
97deaf3482 Update twitch_plays.dm 2020-12-29 15:56:10 -07:00
silicons
95c420ccba Update twitch_plays.dm 2020-12-29 15:55:14 -07:00
silicons
042c7d9b8b wew 2020-12-28 21:07:55 -08:00
silicons
d338d7a14b auto 2020-12-28 21:03:50 -08:00
silicons
964b60c9ca ok 2020-12-28 17:50:16 -08:00
silicons
ee9cc135f1 fix 2020-12-28 17:43:50 -08:00
silicons
a8bc98aa40 ok 2020-12-28 17:29:55 -08:00
silicons
6e86cc7758 wew 2020-12-28 17:27:16 -08:00
Timothy Teakettle
b1e5888ce0 Update tackle.dm 2020-12-28 17:40:04 +00:00
Timothy Teakettle
05e5c80dce runtime 2020-12-26 00:17:29 +00:00
Timothy Teakettle
8c8be2b92e tackle and puddle 2020-12-25 21:45:07 +00:00
silicons
ea21151462 LF 2020-12-20 18:55:45 -07:00
DeltaFire
1d604d489c Merge pull request #13763 from Hatterhat/rped-qol
RPED drops lowest tier parts
2020-12-16 05:17:44 +01:00
Hatterhat
263a75ec45 how moment 2020-12-14 16:24:08 -06:00
Hatterhat
04c35f3161 now this is actually based 2020-12-12 20:48:59 -06:00
silicons
60a0db7730 oh thanks
Co-authored-by: DeltaFire15 <46569814+DeltaFire15@users.noreply.github.com>
2020-11-25 22:20:50 -07:00
silicons
89d18c681d buffed again 2020-11-22 15:16:40 -07:00
silicons
18bdda1273 fix 2020-11-22 15:01:19 -07:00
silicons
13ebceb670 why did i do this 2020-11-22 14:56:02 -07:00
silicons
37e26833a6 wew 2020-11-22 14:16:14 -07:00
Putnam3145
9d300ade35 Merge pull request #13677 from silicons/newlines
Adds missing EOF newlines
2020-11-18 17:50:38 -08:00
DeltaFire
185c8929b0 Merge remote-tracking branch 'upstream/master' into supplypod-shrapnel 2020-11-16 04:29:43 +01:00
silicons
9d7226cb4d Merge pull request #13670 from shellspeed1/master
Makes floor bots buildable with all toolboxes.
2020-11-15 17:12:37 -07:00
DeltaFire
e0b2156142 fixes fixes fixes 2020-11-14 19:26:54 +01:00
DeltaFire
a0fac5924f e
I want my warcrime supply pods to work and not runtime
2020-11-14 18:00:25 +01:00
silicons
803bff4e5f funny 2020-11-12 23:34:42 -07:00
shellspeed1
7a0c0a0e04 You can now build floor bots with any toolbox 2020-11-09 21:24:45 -08:00
Timothy Teakettle
46dbb9345d slime puddles look better and cant be abused by lings (#13567)
* perfect

* further changes

* no squeaking please

* no more squeaking damnit

* no more squeaking damnit

* slower

* they get broken armor

* broken armor application

* Apply suggestions from code review

* add a comma

* make crossed work properly

* Update squeak.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-11-01 21:40:58 +01:00
kappa-sama
aa696edd84 this 2020-10-20 19:39:23 -04:00
silicons
f16343d726 Update squeak.dm 2020-10-16 20:48:11 -07:00
DeltaFire
4ccf40f775 Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
This reverts commit 27a099c6bf.
2020-10-11 00:53:18 +02:00
DeltaFire
27a099c6bf Revert "Merge branch 'master' into robotic-limbs-PT2"
This reverts commit 73b5267425, reversing
changes made to 2e780bfff2.
2020-10-11 00:51:39 +02:00
DeltaFire
73b5267425 Merge branch 'master' into robotic-limbs-PT2 2020-10-11 00:44:28 +02:00
silicons
ad32b8f437 Merge pull request #13472 from timothyteakettle/slime-puddle
the pr that lets slimes turn into useless puddles
2020-10-10 11:14:25 -07:00
silicons
19f1e99a8c mass ports like 15 tg prs + counting (#13386)
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2020-10-10 12:20:33 +02:00
DeltaFire
4146566af0 hoo boy
replaces all mentions of bodypart_robotic with is_robotic_limb() where possible, adds BODYPART_HYBRID, adds helpers for organic / robotic limbs (is_robotic_limb() / is_organic_limb(), with a arg to override it accepting hybrid limbs)
Also makes the the surgery to heal robotic limbs work if the torso isn't a robot, but rather if there are robotic bodyparts, makes the IPC brain repair.. only accept IPC brains (obviously), makes the damage threshholds for robo-limbs vars instead of a fix 25 with hybrid ones predefined at 25 / 15 (trigger / mindamage), adds an error message to fixing them if already at theshhold, etc. Now just for replacing BODYPART_ORGANIC with is_organic_limb aswell where applicable.. also actual values for the other robo limbs. Fun!
2020-10-06 17:34:13 +02:00