Commit Graph

19001 Commits

Author SHA1 Message Date
oranges e717ec042f Merge pull request #22896 from Mervill/tiefix
Fixes issue with attorney badges speech bubble
2017-01-12 13:50:42 +13:00
oranges 5c036ec48a Merge pull request #22914 from Shadowlight213/mailborgs
Fixes borg emote sounds using pitch vary
2017-01-12 13:50:20 +13:00
PKPenguin321 b0d0ed7683 Ash walker tendrils now heal 5% of their HP upon feeding (#22915)
* limbs no longer have throwforce

* makes tendrils heal upon eating people instead

* undoes changes to bodyparts.dm

* fancifies the healing to use a proc
2017-01-11 19:49:09 -05:00
swindly 3c3866d126 fixes radiation (#22911) 2017-01-11 19:48:53 -05:00
Cyberboss 212610abdf Fixes dropping beakers into pre-loaded cyro cells (#22889) 2017-01-11 17:32:30 -05:00
oranges 05270df9f3 Merge pull request #22905 from lzimann/lzimann-patch-1
Readds the shiver emote
2017-01-12 10:13:50 +13:00
oranges 41a6efd987 Revert "Fixes instant summons and probably a few other edge cases" (#22917) 2017-01-10 20:55:26 -05:00
Joan Lung 75999e1c6c Fixes instant summons and probably a few other edge cases (#22890)
* Fixes instant summons and probably a few other edge cases

* woken in a fog don't sweat it
and reckon none of it had come from you

* echo

* no lesson in magic, just untimely dreams

* slapdash code queen
2017-01-11 12:53:05 +13:00
oranges 33b0cbbdba Merge pull request #22879 from coiax/resonator-changes
Tiny mining equipment changes
2017-01-11 12:52:22 +13:00
oranges d883333a2c Merge pull request #22880 from coiax/renames-bad-food
Renames "????" to "bad_food"
2017-01-11 12:51:59 +13:00
oranges c0fc4bd827 Merge pull request #22881 from MrStonedOne/patch-285
in which mso forgets static proc vars apply to types, and not instances
2017-01-11 12:51:33 +13:00
coiax 6a7656a10d Maybe fixes cyborg name bug (#22882)
* Maybe fixes cyborg name bug

It might fix #22844, but I can't replicate the bug locally, which makes
testing difficult.

* Remie review
2017-01-11 12:51:17 +13:00
oranges a61833c56b Merge pull request #22884 from MrStonedOne/ter13ping
Delays ping tracking upon client connection.
2017-01-11 12:50:58 +13:00
oranges 93ce63b3e3 Merge pull request #22886 from Cyberboss/patch-8
Adds a stack_trace to help find the pipeline bug
2017-01-11 12:50:47 +13:00
oranges 1e674231b4 Merge pull request #22877 from Core0verload/muh_hand
Fixes broken lights burning your hand in some cases
2017-01-11 12:50:20 +13:00
Cyberboss e8745fad08 Moves the duplicate SplashReagents to the container level (#22870)
* Fixes the real issue

* Bigger splash if not thrown
2017-01-11 12:49:22 +13:00
oranges 3ad35c23ab Merge pull request #22869 from Cyberboss/ReagentsShouldNotBeLeftNull
Moves reagents back into atoms. Fixes confusion between reagents/reagents_list
2017-01-11 12:49:02 +13:00
bgobandit 714188a6ad The chameleon stamp should properly deny cargo manifests now. (#22867)
* Chameleon stamps should properly deny cargo manifests.

* this bugged me
2017-01-11 12:48:12 +13:00
Shadowlight213 34e4d00326 Fixes borg emotes having frequency vary set 2017-01-10 15:47:49 -08:00
Leo 8cb3c403fb Readds the shiver emote 2017-01-10 09:49:56 -02:00
Mervill 1fdc6629b6 Neck items (ties) on_uniform_equip() propery passes the user arg, and isn't run if the target slot is hands 2017-01-09 17:27:14 -08:00
oranges 2f5a1a519b Merge pull request #22840 from KorPhaeron/summon_item
Fixes embedded object interaction with instant summons
2017-01-10 10:11:31 +13:00
oranges 541c8ad135 Merge pull request #22845 from Core0verload/equipment_fix
Refactor of outfits datums and corpse spawners
2017-01-10 10:10:10 +13:00
oranges eb2b8a1f1e Merge pull request #22841 from MrStonedOne/revert-22754-fastlights
Revert "Removes animation on lighting changes, increases light max radii"
2017-01-10 10:01:05 +13:00
oranges 32a2f2bf5e Merge pull request #22833 from ChangelingRain/descfix
Fixes a login message
2017-01-10 09:57:59 +13:00
oranges f79476634c Merge pull request #22829 from ChangelingRain/blockedturffix
Fixes a few things considering turfs 'blocked' by a mob
2017-01-10 09:57:43 +13:00
oranges cea71b3348 Merge pull request #22808 from Cyberboss/patch-6
Refactors events to use callbacks
2017-01-10 09:53:52 +13:00
XDTM 6a562f7b5a Makes earmuffs and null rods protect from Voice of God, adds earmuffs to autolathe (#22764)
* Makes mindshield implants protect from VoG

* earmuffs

* New deal

* Rudimentary logging

* Retvar/Narsie fix
2017-01-10 09:53:09 +13:00
oranges 21331f6c14 Merge pull request #22741 from KorPhaeron/anchoredflagholder
CTF bug fixes
2017-01-10 09:52:17 +13:00
Cyberboss 97a57d9805 Fixes roundstart MMI runtimes (#22771)
* Fixes roundstart MMI runtimes

* Fix the problem temporarily
2017-01-09 21:36:34 +01:00
Cyberboss fd62ea57c0 Adds a stack_trace to help find the pipeline bug 2017-01-09 14:04:20 -05:00
MrStonedOne c8b0a25e18 Delays ping tracking upon client connection. 2017-01-09 09:02:57 -08:00
Kyle Spier-Swenson a8cb96dd61 in which mso forgets static proc vars apply to types, and not instances
also, this stupid splitting of define and procs is stupid, so i put the var there so i can use the web editor. deal with it.
2017-01-09 08:11:42 -08:00
Kyle Spier-Swenson 9a95a887d7 Fixes preferences links for ghost radio/pda (#22854) 2017-01-09 11:04:04 -05:00
Jack Edge bbde0f3033 Renames "????" to "bad_food"
Fixes #22864. Who knows why it was called "????" in the first place, but
it's not going to be anymore.

Also adds a description.
2017-01-09 15:41:41 +00:00
Jack Edge 6a7c98695f Tiny mining equipment changes
- Resonators now check when rupturing for local air pressure to
determine damage
- Made basic mining scanners use addtimer()
- Tweaked the descriptions of resonance and resonator

I was trying to fix #22878 but I couldn't reproduce the bug, and ended
up making these changes anyway.
2017-01-09 15:34:01 +00:00
Cheridan 12d4ab68c7 Merge pull request #22843 from bgobandit/slimesurgery
Slime core surgery works again.
2017-01-09 00:21:09 -06:00
c0 f250925a7a Fixes broken lights burning your hand in some cases 2017-01-09 09:11:01 +03:00
Cyberboss 6e622eedd1 Moves reagents into atoms 2017-01-08 23:02:37 -05:00
Remie Richards 3f1faf85cb Fixes augmentation surgery allowing non-robot limbs (#22815)
* Fixes augmentation surgery allowing non-robot limbs

```&&``` -> ```||```

* user feedback is nice
2017-01-08 20:32:07 -05:00
PKPenguin321 bf65b28334 critical grammar fix (#22830)
)
2017-01-08 20:31:17 -05:00
oranges 25f446da76 Merge pull request #22853 from MrStonedOne/patch-283
[s]Throttles preferences hrefs
2017-01-09 08:59:16 +13:00
Cheridan 4a03a77244 Merge pull request #22803 from ChangelingRain/tempoverlays
Changes a few things into temporary visual effects
2017-01-08 12:51:07 -06:00
Cheridan 7003e73e97 Merge pull request #22807 from bgobandit/ilovetypos
Fixes photon torpedo description, fixes more grammar shit.
2017-01-08 12:40:01 -06:00
Cheridan bbeecc35ac Merge pull request #22822 from swindly/radfix
Fixes rad immune species accumulating infinite radiation
2017-01-08 12:27:55 -06:00
Kyle Spier-Swenson db27bb7727 Throttles preferences hrefs
The user will not be allowed to trigger a click on a preferences href until their previous one has finished.

rshoe is using it spam us.

I know somebody was talking about trying to do a more proper fix, such as by making it not re-generate these when it's the same, so i'll test merge this until 24 hours or they make such a pr.
2017-01-08 06:58:56 -08:00
Kyle Spier-Swenson b3acf5b9d5 Min alpha part 2 2017-01-08 00:21:47 -08:00
bgobandit 119747bb78 misleading medibeam message 2017-01-08 03:13:53 -05:00
c0 0b311121d9 Refactor of outfits datums and corpse spawners 2017-01-08 10:30:31 +03:00
bgobandit 2467c68d42 Slime core surgery works again. 2017-01-08 00:42:14 -05:00