d3c774cbfa
Update flightsuit.dm
2017-07-11 01:25:09 -07:00
efff1acc0b
revert ff1198383a
2017-07-11 07:30:06 +00:00
ff1198383a
Merge commit '2a54776ac3468f964ee89ed5f3d1f3f91dcc705f'
2017-07-11 07:12:32 +00:00
2a54776ac3
testing version for test merge
2017-07-11 00:08:20 -07:00
6539fa2cb5
Refactors flightsuit code to hopefully be less dumb ( #28033 )
...
Refactors flightsuit code to be less crappy
2017-07-11 11:23:02 +12:00
d135dc2643
Merge pull request #29162 from ChangelingRain/directionliststweak
...
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs
2017-07-10 18:45:52 -04:00
127003957b
Organ Update: Refactors chemical and nutrient metabolization onto two new organs, the liver and the stomach. ( #28913 )
...
* initial
* add paranthesis
* add zones
* update DNA
* indent
* descriptions
* start refactor
* update dme
* paranthesis
* remove old proc
* refactor digestion onto stomach
* add handle_liver()
* fix
* add stabiliver
* add a warning for liver failure
* lower frequency of warning message
* switch to prob
* fix permissions
* forgot something
* change recipe
* implement liver damage
* change operator
* fix
* fix
* oh the irony
* rebalance
* refactor alcohol tolerance and add med scanning
* fix
* misc fixes, changes and refactors
* fix?
* remove src
* misc changes
* more bugfix attempts
* Update liver.dm
* Update stomach.dm
* FIXED!!!!
* preparation for rnd organs
* rename var
* string changes
* implement tox filtration
* fix
* fix
* fix
* toxin filtration v2
* misc fix
* fix
* fix
* should not be coding this late at night
* reee
* misc
* fix runtimes
* digest me
* typepeath
* add mutant support
* comment and spacing
* commentz
* typepath
* fixes
* fix?
* fix
* change
* plasmeme organs!
* Update liver.dm
* Update stomach.dm
* stabiliver => corazone
* cyberboss review
* cyberboss more like cyberBOOB
* okay cyberBOOB
* cyberBOOOOOb
* static list
* fix?
* fix
* ID please
* hows that for resolving name collision?
* Fix shit
2017-07-10 17:21:27 -04:00
76edcf1c40
Allows admins to set messages when they delay the round end ( #29064 )
...
* initial
* fixes
* changes
* move to SSticker
* logging
* msg changes
* fix
* Jordie changes
* remove span
* change if
* fix
* cyberboss review
2017-07-10 10:55:17 -04:00
59ef81245b
Changes some 1s and 0s to TRUE and FALSE ( #29144 )
2017-07-10 10:31:34 -04:00
8776c15703
Supermatter code cleanup ( #29103 )
...
* Simple animals are now properly disintegrated
* Now it's a cleanup PR!
* sanity check me out
* praise the webeditor!
2017-07-09 20:59:48 -04:00
9cf4ab3233
Fixes race condition with admin proc calls and load admins ( #29143 )
...
* Update admin_ranks.dm
* Update admin_ranks.dm
* Update admin_ranks.dm
* Update admin_ranks.dm
2017-07-09 20:48:15 -04:00
bd9c7c5d03
Merge pull request #29134 from RandomMarine/trynottobreaklaw2
...
Allows drones to switch to/from harm intent
2017-07-09 20:44:24 -04:00
4a2545c371
Merge pull request #29141 from Xhuis/curse_mob_fix
...
Necropolis curse mobs no longer fall into chasms
2017-07-09 20:44:07 -04:00
d4e5cfd5a3
Merge pull request #29140 from ChangelingRain/integrity
...
Removes now-unnecessary obj_integrity definitions
2017-07-09 20:43:44 -04:00
ec9439b915
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs
2017-07-09 17:24:28 -04:00
40aa9ce8ce
Switches SM squawk to report integrity ( #29084 )
2017-07-09 11:14:05 -04:00
9e3e8e9df6
Fixes entire stacks of goliath plates being used on mechs ( #29127 )
2017-07-09 08:44:27 -03:00
b3a5e27369
Update hypospray.dm ( #29139 )
2017-07-09 08:43:18 -03:00
4b9ba464ce
return of the return
2017-07-08 16:18:49 -07:00
c7d28736ec
Curse mobs are now immune to chasms
2017-07-08 15:00:06 -04:00
65ca7de2be
Merge pull request #29123 from Xhuis/catching_refactor
...
Refactors catching to use attack_hand
2017-07-08 15:18:42 -03:00
6ee0e7d8ce
Merge pull request #29120 from Cyberboss/ahelpfix
...
Fixes repeated adminhelp message
2017-07-08 15:18:13 -03:00
24f69f814b
missed these
2017-07-08 14:09:07 -04:00
1feb0021a1
Removes now-unnecessary obj_integrity definitions
2017-07-08 14:02:50 -04:00
b96bc440db
Fixes plasma glass merging with normal glass ( #29114 )
...
* Fixes plasma glass merging with normal glass
* Update window.dm
* Update smelting_designs.dm
2017-07-08 10:44:32 -04:00
54f46ca1a0
Merge pull request #29097 from KorPhaeron/lex
...
New portable generator icons
2017-07-07 23:28:00 -04:00
d173597660
gives drones harm intent
2017-07-07 19:34:40 -07:00
bbdfed3c2a
Dreams while sleeping are now slightly longer on average and will contain more possibilities ( #29104 )
...
* Dreams while sleeping are now slightly longer on average and will contain more possibilities
* I don't think this is worth it at all but sure whatever
* are you dreaming too
* dream
2017-07-07 22:17:57 -04:00
c9e1f2a42f
Kor's a butt
2017-07-07 20:44:41 -04:00
796063c910
Adding the mook/wanderer mob for planetstation ( #29046 )
...
* Adding the mook/wanderer mob for planetstation
* Adds the two .ogg's for the mook mob
* mook fixes
* Mook fixes
* more fixes for mook
* Makes the mook's slash combo do an animation instead of just retaining the same pose
* reh
2017-07-07 15:15:31 -04:00
44e99ed7ba
Adds Headphones! ( #28993 )
...
* kek
* this /should/ work.
* icon updates and wardrobes and vendors
* remie
* Update ears.dm
* typecast
* states
* updates
* Update fitness.dm
* Update wardrobe.dm
* Update vending.dm
2017-07-07 13:44:21 -04:00
4553bc8109
Merge pull request #29090 from ShizCalev/sm-alarm-sounds
...
Adds alarm sounds to SM
2017-07-07 13:18:04 -04:00
b057e19ec0
Adds collapsing stone tiles ( #29042 )
...
* Adds collapsing tiles
* Adds the 'falling' variable
* adds checking for kosms
* Changes, chasm works now
* VERY fast tile falling at incredible hihg speed
* stuff!
* removes a weird define
* FALSE
2017-07-07 13:17:37 -04:00
9a04270bc8
Refactors catching
2017-07-07 12:42:20 -04:00
55c2c2af7f
Fixes repeated adminhelp message
2017-07-07 11:36:59 -04:00
a1d829126f
Merge pull request #29076 from Cyberboss/LOCK_IT_DOWN
...
Fixes permissions elevation exploit
2017-07-07 11:37:28 -03:00
b1f76269b4
Fixes permissions elevation exploit
2017-07-07 10:29:14 -04:00
e74ba17b96
Merge pull request #29080 from ShizCalev/sm-attack-tweaks
...
Removed silicon SM interact message
2017-07-07 10:23:04 -04:00
8abc1877ff
Merge pull request #29085 from ShizCalev/sm-rounding
...
Changes SM integrity rounding
2017-07-07 09:52:56 -04:00
c1e3ac82ec
Merge pull request #29081 from Fox-McCloud/reflect-refactor
...
Minor Projectile Reflection Refactor
2017-07-07 09:52:45 -04:00
97fa94e9c6
Fix incorrect call to do_attack_animation ( #29072 )
...
This was causing a runtime as 1 is not a valid parameter
2017-07-06 22:41:39 -05:00
61af168b9e
Merge pull request #29071 from tgstation/Cyberboss-patch-2
...
Fixes world.internet_address in irc check
2017-07-06 22:55:51 -03:00
0ad378a7bb
Actually fixes wormhole jaunters, and no it was not my fault. ( #28998 )
2017-07-06 22:15:35 -03:00
a43ba99207
Merge pull request #29061 from ChangelingRain/warpeffect
...
Warp cubes are slightly less instant but way cooler
2017-07-06 22:12:21 -03:00
0f7dff1a19
Merge pull request #29068 from ShizCalev/lowercase
...
Lowercased computer names
2017-07-06 22:09:11 -03:00
7324244459
Doubles goonchat scroll snap tolerance ( #29056 )
2017-07-06 20:19:34 -04:00
c478796ee9
New portgen icons
2017-07-06 20:10:58 -04:00
46b16513e2
it's truly false
2017-07-06 16:13:22 -04:00
68102aaa0c
Refactors speech/communication logging and adds coordinates to speech logs ( #28997 )
...
* Adds locations to speech and related communications
Refactors how logging is handled for these.
* changes
* ahhhhh
* preemptive merge conflict undoing maybe?
* Let's not delay this further
2017-07-06 16:06:43 -04:00
44066d2258
Switch instead
2017-07-06 14:09:00 -04:00
kevinz000
bagil
tgstation-server
MrStonedOne
Jordan Brown
Tacolizard
ShizCalev
Ashe Higgs
Joan Lung
RandomMarine
Leo
MoreRobustThanYou
Ergovisavi
oranges
KorPhaeron
Fox-McCloud
Shadowlight213
shizcalev