1c8badd8fe
Merge pull request #28590 from optimumtact/korthemoorstrikesthebooritsquiteashorethatbringsustothefore
...
Refactors hitreaction to pass in the hitting atom
2017-06-20 09:21:14 -04:00
6f1a4e22b0
Merge pull request #28591 from lzimann/whydoweletpeopletouchthecodelikethis
...
Changes tooltip verbs to be on preferences tab
2017-06-20 09:20:48 -04:00
f5e636673b
Short-circuiting doesn't work like this.
2017-06-20 11:58:43 +02:00
d2b5b45381
Merge pull request #28579 from KorPhaeron/soap
...
Chisel messages will be below objects
2017-06-19 23:07:12 -04:00
0234fede9e
Merge pull request #28581 from ChangelingRain/fleshfrombone
...
Fixes improper text replacement of Fireball.ogg and FleshToStone.ogg
2017-06-19 23:06:38 -04:00
c2069e0446
Merge pull request #28583 from Xhuis/equip_delay_framework
...
Adds framework for equip delays and adds it to the straight jacket
2017-06-19 23:06:07 -04:00
186d17b77b
Refactors hitreaction to pass in the hitting atom
...
Required some upstream changes to the check_shields proc to also
reliably pass in the atom
2017-06-20 02:48:17 +00:00
fce774d7ee
Bay-like cryotube pods ( #28350 )
...
* Add files via upload
* Add files via upload
* Add files via upload
* Lowered open state glass alpha
* Now cryos have open icon
* and the code is fixed
* oops
* wrong path
* oops2
* Custom sprites for some mobs inside cryo
* More code
* Moar code commit, why not?
2017-06-19 22:42:39 -04:00
2328081b25
Merge pull request #28577 from Xhuis/freezer_heater_fix
...
Freezers and heaters now drop the correct materials (Fixes #28560 )
2017-06-19 22:26:29 -04:00
42dffeed07
Merge pull request #28572 from Xhuis/zombie_revive_message_shrink
...
Reduces the size of the zombie revival flavor text (Fixes #28568 )
2017-06-19 21:52:57 -03:00
cad788efef
Tasers and projectiles stun for the proper amount
2017-06-19 20:43:56 -04:00
99a5230e62
fix that
2017-06-19 15:43:42 -04:00
38ec5563dc
Fixes slips
2017-06-19 14:57:25 -04:00
563f66700c
Sleeping is now a status effect
2017-06-19 14:47:35 -04:00
619e53e138
Fixes disablers lacking an inhand sprite
2017-06-19 11:51:19 -04:00
3dac7d1797
Removes offhand objects from fake artifact cases
2017-06-19 11:25:35 -04:00
27c665bfb5
Variable renames, some sets
2017-06-19 11:17:15 -04:00
f37e2a5cc3
reeeeeeeeeeeeeee
2017-06-19 07:52:31 -07:00
8d7cdf7596
Merge pull request #28549 from kevinz000/patch-223
...
Makes gender change potions more noticeable
2017-06-19 09:53:44 -04:00
06022a0ba1
Merge pull request #28552 from RandomMarine/lightuplavaland
...
Bonfires light up in lavaland atmos
2017-06-19 09:53:12 -04:00
50da12ba12
Changes tooltip verbs to be on preferences tab
2017-06-19 09:27:30 -03:00
2a31e44d95
Adds framework for equip delays
2017-06-18 23:24:39 -04:00
bef4c2c318
Fix cid reconnect message not showing ( #28580 )
2017-06-18 23:17:45 -04:00
cc3c809646
Fixes improper text replacement of Fireball.ogg and FleshToStone.ogg
2017-06-18 23:10:25 -04:00
24f391d943
[READY]Adds examine tooltips ( #28407 )
...
* initial
* add preference verb
* forgot to actually make the verb work
* make verb use prefs
* fix and save prefs
* change proc name
* varry good
* will this work?
* ok i think this will work
* halp
* reeee
* fix
* implement remie's suggestions
* fix indentation
* give verb feedback
* change threshold
* mrperson changes
* change threshold
* add custom tooltip delay
* decapitalize process()
* mouseOver = FALSE
* remake delay system
* round force
* fix capitalization
* enable force_string override
* fix force string override
* add TIMER_STOPPABLE flag
* check user
* change operator
* add a comment
* set minimum force to 0
* is this how you do it?
* update savefile
* simplify
* fix savefile
* fix list init
* remove rounding
* change threshhold
* remove colors
* fix
* add spaces
* micro-optimization fnr
* fix permissions
* implement suggestions
* fix permissions
* cyberboss suggestion
2017-06-18 22:57:35 -04:00
29e43886e6
Layer
2017-06-18 22:56:28 -04:00
2672d88800
Renames stun effects and changes stun input values as preliminary work for changing stuns to status effects ( #28524 )
2017-06-18 23:03:51 -03:00
523498c85a
. =
2017-06-18 21:54:20 -04:00
fd1c8861ed
Fixes Freezer and Heater boards randomizing
2017-06-18 21:45:31 -04:00
81951d87c5
Shrinks the zombie revive message
2017-06-18 20:59:43 -04:00
ade54966dd
Merge pull request #28543 from ChangelingRain/trophyfix
...
Fixes crusher trophies not properly being added
2017-06-18 19:41:42 -04:00
ce39cd32de
Updates blender descriptions ( #28536 )
...
* Update reagentgrinder.dm
* Update reagentgrinder.dm
* Update reagentgrinder.dm
* Update reagentgrinder.dm
* Update reagentgrinder.dm
2017-06-18 14:08:41 -04:00
27d8a733a7
AGHH ( #28547 )
2017-06-18 10:59:52 -04:00
1860e1a2ea
Paper frames, but with new sprites. ( #28452 )
...
* Paper frames, take two
* With entirely new sprites
* and basemap
* no directional doors also smoothing
* changes requested
* woops
* deconstruct -> Destroy
2017-06-18 10:45:35 -04:00
91d59af7c4
Merge pull request #28531 from Expletive/crayonpdas
...
Move the clown and mime's unique crayons to their PDAs.
2017-06-18 10:10:05 -04:00
6e293bb932
bonfires on lavaland?
2017-06-18 06:41:19 -07:00
efc62422b3
Update xenobiology.dm
2017-06-18 00:59:22 -07:00
5bc348c366
Adds traitor steal objective: the Supermatter Sliver. (Fixed) ( #27913 )
...
* Adds a new steal objective, the Supermatter Sliver.
* actually commits theft_tools honke
* i actually dk what this is
* fixes v1
* Supersmatter sliver requested changes
* you know what I fucking hate is unchecking shit
* please does this fix it fucking dme clown shit
* placates the cyberboss and the lziard
* fucking clownery
* I forgot to fucking check it
* Hope this fixes it
* will my children inherit this PR
* reeeeeeeeeeeeeeee
* Let's put this horse to rest now....
2017-06-17 22:32:38 -04:00
79cefc69d7
Merge pull request #28526 from RandomMarine/nothingmatters
...
Remember to test your PRs, kids! - Rebalances matter cartridge cost redux
2017-06-17 22:26:09 -04:00
c2f57efccd
damn it github
2017-06-17 18:50:47 -07:00
5eef7d52bc
Merge branch 'master' into crayonpdas
2017-06-17 18:39:18 -07:00
790a7037e0
Fixes crusher trophies not properly being added
2017-06-17 19:52:48 -04:00
9aacee76d0
Merge pull request #28497 from Xhuis/tablet_examine_patch
...
Tablets with IDs in them now show the ID's name on examine
2017-06-17 17:55:37 -04:00
35400d0682
The Hierophant is a little less chaotic and murdery on average ( #28490 )
2017-06-17 17:54:23 -04:00
9e74951f3f
Moves the first ID to the auth slot when possible
2017-06-17 17:49:45 -04:00
187ae0bd0e
Merge pull request #28419 from Expletive/pocketprotectors
...
Gives Pocket protectors to various nerdy jobs on the station.
2017-06-17 16:13:09 -04:00
53bb9f2388
Adds screaming for burns ( #28516 )
2017-06-17 16:53:29 -03:00
f07435337c
Merge pull request #28435 from lzimann/typecaches
...
Changes a lot of is_type_in_list to use a typecache
2017-06-17 12:33:03 -04:00
42aa0dd3aa
Changes all the typecaches to the obj definition
2017-06-17 13:24:40 -03:00
0c22596eca
Fix some things assuming lighting corners existed ( #28511 )
2017-06-17 12:03:10 -03:00
Jordan Brown
AnturK
oranges
nicbn
Leo
Joan Lung
Xhuis
kevinz000
Kyle Spier-Swenson
Tacolizard
KorPhaeron
Expletive
RandomMarine
bgobandit