Commit Graph

18979 Commits

Author SHA1 Message Date
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
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
Kyle Spier-Swenson
9a95a887d7 Fixes preferences links for ghost radio/pda (#22854) 2017-01-09 11:04:04 -05: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
Kyle Spier-Swenson
28f84e5d86 Revert "Removes animation on lighting changes, increases light max radii" 2017-01-07 21:12:01 -08:00
KorPhaeron
7dc40c46e6 Fixes embedded object interaction with instant summons 2017-01-07 22:39:15 -06:00
Joan Lung
fe34bfcca4 Fixes a login message 2017-01-07 18:37:40 -05:00
Joan Lung
1f85d27652 Fixes a few things considering turfs 'blocked' by a mob 2017-01-07 17:58:51 -05:00
oranges
37b1fa6eea Merge pull request #22793 from Core0verload/world_time
Fixes latejoin panel and world topic showing incorrect round duration
2017-01-07 19:43:39 +13:00
oranges
d2749cc55f Merge pull request #22788 from MrStonedOne/patch-281
Fixes stealthmin reveal in who
2017-01-07 19:42:31 +13:00
bgobandit
4520e393f7 Fixes the admin message for morph, devil and slaughter demon spawns. (#22770)
* Morphling logs ckey correctly

* refactors every other spawn event apparently

* fixes a typo while I'm in the file
2017-01-07 19:41:39 +13:00
Tacolizard
ac819a17f2 Removes animation on lighting changes, increases light max radii (#22754)
* change light update speed

* lower dynamic light max radius vals

* wew i actually improved the code for once

* remove define

* mso's wish is my command

* yeh biatch

* found one
2017-01-07 19:40:27 +13:00
oranges
89ad3be0d0 Merge pull request #22748 from ChangelingRain/meteorshieldfix
The Meteor Shield station project now actually shields from meteors
2017-01-07 19:40:08 +13:00
oranges
1753f793c9 Merge pull request #22744 from KorPhaeron/aliens2
Fixes alien inventory not updating when toggling spit
2017-01-07 19:39:23 +13:00
oranges
bd796347ad Merge pull request #22743 from XDTM/ReeeND
Fixes destructive analyzer not being able to scan chem containers
2017-01-07 19:39:14 +13:00
oranges
eb0aad18fa Merge pull request #22742 from KorPhaeron/alarm
Fixes cyborgs making strange sounds when empd
2017-01-07 19:38:58 +13:00
TehZombehz
8cc9e6de50 Adds regenerate_organs proc and adds it to relevant regeneration code (#22740)
* Adds regenerate_organs proc to carbon and adds it to relevant regeneration code

I simply took the bit from the admin heal and made it into a proc and
added it to the necessary regeneration-related bits of code.

* Adds regenerate organs back to fully heal

For some reason this didn't get included in the previous commit.

* moves regenerate_organs to organ_internal

As suggested. It fits better here, anyways.
2017-01-07 19:38:29 +13:00
oranges
a0c6052e53 Merge pull request #22726 from coiax/press-start
The Start Now verb sets the round to start immediately
2017-01-07 19:38:15 +13:00
bgobandit
0d4249a5ba addictive typo fixing 2017-01-07 00:55:09 -05:00
bgobandit
d27712b9e5 moar typos 2017-01-07 00:43:02 -05:00
bgobandit
bbbc9b99f7 more typos and stuff 2017-01-06 20:38:54 -05:00
Cyberboss
4fc79dbb95 Refactor events to use callbacks 2017-01-06 20:35:00 -05:00
bgobandit
08a8277873 more grammar fixes 2017-01-06 20:23:15 -05:00
Joan Lung
be6a7642a6 hmm 2017-01-06 17:01:18 -05:00
Joan Lung
5b59050d15 ) 2017-01-06 16:57:17 -05:00
bgobandit
945d4f060f The Floor Is Lava and Advanced Darkness work again. (#22780)
* The Floor Is Lava and Advanced Darkness work again.

* define memes
2017-01-06 16:55:45 -05:00