Leo
d7a2aef4bb
Merge pull request #29193 from kevinz000/patch-247
...
Switches maint panel and screwdriver checks in flightpack code
2017-07-12 10:05:58 -03:00
Jordan Brown
8c7fdf88c2
Cleans up carbons ( #29179 )
2017-07-12 10:15:34 +02:00
shizcalev
62b32d3f7a
reverted organ refactor #28913
...
reverts #28913
2017-07-11 22:08:57 -04:00
Jordan Brown
78a2e5c4c3
Adds the hivebot invasion event ( #28514 )
...
Follow up to #23398
Xhuis & Cyberboss
add: New hivebot invasion event
2017-07-12 13:09:06 +12:00
ShizCalev
c79aeb9cc0
Var cleanup ( #29168 )
2017-07-11 16:32:32 -03:00
Jordan Brown
9e24281c36
Merge pull request #29167 from ShizCalev/box-vent-mapping
...
[Box] Removes stray fan in engineering
2017-07-11 13:00:26 -04:00
Jordan Brown
3a363afd6d
Merge pull request #29174 from Xhuis/tachyon_rotation_fix
...
Adds feedback to the tachyon-doppler array's rotation
2017-07-11 12:59:17 -04:00
Xhuis
0dd37eb262
source dot
2017-07-11 10:59:56 -04:00
kevinz000
d3c774cbfa
Update flightsuit.dm
2017-07-11 01:25:09 -07:00
bagil
efff1acc0b
revert ff1198383a
2017-07-11 07:30:06 +00:00
tgstation-server
ff1198383a
Merge commit '2a54776ac3468f964ee89ed5f3d1f3f91dcc705f'
2017-07-11 07:12:32 +00:00
MrStonedOne
2a54776ac3
testing version for test merge
2017-07-11 00:08:20 -07:00
MoreRobustThanYou
5836c10e30
YOU CAN NOW PET BLOBS ( #29159 )
...
* YOU CAN NOW PET BLOBS
* Update theblob.dm
* Update theblob.dm
* Update theblob.dm
* Update theblob.dm
* Update theblob.dm
* Update theblob.dm
* Update theblob.dm
* Update theblob.dm
2017-07-10 23:50:50 -04:00
kevinz000
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
Joan Lung
eb51ca408e
Fixes master not compiling ( #29181 )
...
dangit cyberboss
2017-07-10 20:06:36 -03:00
Joan Lung
b1a88df103
get_edge_target_turf() now finds the proper turf when using diagonal directions ( #29161 )
...
* get_edge_target_turf() now finds the proper turf when using diagonal directions
* I really hate that these don't share a naming scheme it sucks
* code very quickly
2017-07-10 18:46:36 -04:00
Jordan Brown
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
Ashe Higgs
807223d0b3
Replaces clockwork component initials with icons ( #29156 )
...
* The clockwork slab now shows component icons
* Adds the icons to Recollection
* removes a line break
* New cogwheel sprites by Joan
* Resizing
2017-07-10 18:45:23 -04:00
Tacolizard
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
shizcalev
c88d9fb9c9
removed anchored emcloset desc
2017-07-10 11:46:27 -04:00
Xhuis
1f7f0553b8
The tachyon array's rotation now has feedback
2017-07-10 11:32:12 -04:00
Tacolizard
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
ShizCalev
59ef81245b
Changes some 1s and 0s to TRUE and FALSE ( #29144 )
2017-07-10 10:31:34 -04:00
MrStonedOne
f95258370d
And the comparison debug version
2017-07-09 23:55:45 -07:00
shizcalev
efef14d1bb
Updated closet name
2017-07-10 01:48:00 -04:00
shizcalev
30e0d4b270
[Box] Removes stray fan in engineering
...
fixes #28862
2017-07-10 01:22:40 -04:00
MrStonedOne
e5d3cd807d
commiting debug version just so its on record somewhere if i want it again.
2017-07-09 22:22:19 -07:00
Ashe Higgs
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
kevinz000
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
Jordan Brown
afc5640fd6
Merge pull request #29145 from kevinz000/patch-244
...
Updates vending refill packs to reflect additional items added in headphones PR
2017-07-09 20:45:08 -04:00
Jordan Brown
bd9c7c5d03
Merge pull request #29134 from RandomMarine/trynottobreaklaw2
...
Allows drones to switch to/from harm intent
2017-07-09 20:44:24 -04:00
Jordan Brown
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
Jordan Brown
d4e5cfd5a3
Merge pull request #29140 from ChangelingRain/integrity
...
Removes now-unnecessary obj_integrity definitions
2017-07-09 20:43:44 -04:00
Joan Lung
ec9439b915
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs
2017-07-09 17:24:28 -04:00
ShizCalev
40aa9ce8ce
Switches SM squawk to report integrity ( #29084 )
2017-07-09 11:14:05 -04:00
Jordan Brown
1e173f96c6
Fixes wrapping objects ( #29125 )
2017-07-09 11:13:15 -04:00
Joan Lung
9e3e8e9df6
Fixes entire stacks of goliath plates being used on mechs ( #29127 )
2017-07-09 08:44:27 -03:00
kevinz000
248cf95273
Update flashbang.dm ( #29136 )
2017-07-09 08:43:43 -03:00
kevinz000
b3a5e27369
Update hypospray.dm ( #29139 )
2017-07-09 08:43:18 -03:00
MrStonedOne
85de154132
astar improvements
...
also brought astar back up to specs, gave pathnode better vars
2017-07-09 00:27:39 -07:00
RandomMarine
4b9ba464ce
return of the return
2017-07-08 16:18:49 -07:00
Joan Lung
db503ace11
boss
2017-07-08 18:29:59 -04:00
kevinz000
5e80b018eb
Update vending_items.dm
2017-07-08 13:57:10 -07:00
Xhuis
c7d28736ec
Curse mobs are now immune to chasms
2017-07-08 15:00:06 -04:00
Leo
65ca7de2be
Merge pull request #29123 from Xhuis/catching_refactor
...
Refactors catching to use attack_hand
2017-07-08 15:18:42 -03:00
Leo
6ee0e7d8ce
Merge pull request #29120 from Cyberboss/ahelpfix
...
Fixes repeated adminhelp message
2017-07-08 15:18:13 -03:00
Joan Lung
24f69f814b
missed these
2017-07-08 14:09:07 -04:00
Joan Lung
1feb0021a1
Removes now-unnecessary obj_integrity definitions
2017-07-08 14:02:50 -04:00
MoreRobustThanYou
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
Jordan Brown
e89408c15e
Merge pull request #29112 from MoreRobustThanYou/patch-4
...
Reinforced Plasma Glass is more SME-worthy
2017-07-08 10:43:57 -04:00