Commit Graph

9648 Commits

Author SHA1 Message Date
LetterJay
982eef4158 Merge pull request #6227 from Citadel-Station-13/upstream-merge-36524
[MIRROR] Walls made entirely of wood!
2018-04-01 17:46:45 -05:00
LetterJay
7d1746a84a Merge pull request #6226 from Citadel-Station-13/upstream-merge-36865
[MIRROR] adds a "the" to robo's supervisor in job description
2018-04-01 17:46:22 -05:00
LetterJay
2177a51a09 Merge pull request #6225 from Citadel-Station-13/upstream-merge-36856
[MIRROR] The y/n confirmation for laying eggs or resin over vents as a xeno is no longer reversed
2018-04-01 17:46:03 -05:00
LetterJay
f5b2315531 Merge pull request #6223 from Citadel-Station-13/upstream-merge-36885
[MIRROR] Fixes revenants being unable to siphon after failing a siphon
2018-04-01 17:45:41 -05:00
LetterJay
a11f0c4eb7 Merge pull request #6222 from Citadel-Station-13/upstream-merge-36829
[MIRROR] [s]Minor Refactor of click code, anti-auto clicker protection
2018-04-01 17:45:21 -05:00
LetterJay
64705aaf07 Merge pull request #6221 from Citadel-Station-13/upstream-merge-36864
[MIRROR] Cleaned up tile pointer circuit and converted to absolute coordinates
2018-04-01 17:45:04 -05:00
LetterJay
6b50b35897 Merge pull request #6140 from Citadel-Station-13/upstream-merge-36743
[MIRROR] Fixes modular computer ui_interact runtime
2018-04-01 17:41:34 -05:00
LetterJay
9bb405d27c Merge pull request #6147 from Citadel-Station-13/upstream-merge-36738
[MIRROR] Nutriment can get you fat again.
2018-04-01 17:40:38 -05:00
fludd12
7826515aed Walls made entirely of wood! (#36524)
* Buffs Lifebringers (And kind of botany.)

* Retools staff to use earthsblood as fuel, can now remove rock walls

* No more blessings!

* Dismantle the means of production.
2018-04-01 12:24:33 -05:00
Jordan Brown
4d0df4ab16 Merge pull request #36865 from factoryman942/master
adds a "the" to robo's supervisor in job description
2018-04-01 11:16:57 -05:00
Jordan Brown
9b8ca10da2 Merge pull request #36856 from iskyp/resin+egg
The y/n confirmation for laying eggs or resin over vents as a xeno is no longer reversed
2018-04-01 11:11:38 -05:00
YPOQ
a18aec6fa5 Fixes revenants being unable to siphon after failing a siphon 2018-04-01 08:33:39 -05:00
vuonojenmustaturska
ae61521e67 Merge pull request #36829 from MrStonedOne/onclick_rework
[s]Minor Refactor of click code, anti-auto clicker protection
2018-04-01 08:24:12 -05:00
vuonojenmustaturska
cf3826f3bf Merge pull request #36864 from robbym/master
Cleaned up tile pointer circuit and converted to absolute coordinates
2018-04-01 08:19:52 -05:00
LetterJay
88f328651f Update food_reagents.dm 2018-04-01 04:39:21 -05:00
LetterJay
610a001ad5 Update computer_ui.dm 2018-04-01 04:37:57 -05:00
Poojawa
75a49c53c8 Fixes dogborg sitting (#6112) 2018-04-01 04:06:10 -05:00
LetterJay
17e92ca86b Merge pull request #6152 from Citadel-Station-13/upstream-merge-36734
[MIRROR] Colossus projectile runtime removal
2018-04-01 01:03:46 -05:00
LetterJay
bd28b80a10 Merge pull request #6182 from Citadel-Station-13/upstream-merge-36838
[MIRROR] AIFixer no longer updates overlays on every process()
2018-04-01 01:03:33 -05:00
LetterJay
c19f285322 Merge pull request #6179 from Citadel-Station-13/upstream-merge-36807
[MIRROR] Fixes some edge cases with chameleon projectors and sleepers
2018-04-01 01:03:10 -05:00
LetterJay
24d4b310cd Merge pull request #6082 from Citadel-Station-13/upstream-merge-36147
[MIRROR] [READY] ~SPELL CARDS~, homing projectiles, and more!
2018-04-01 01:01:55 -05:00
LetterJay
cccab00fed Merge pull request #6134 from Citadel-Station-13/upstream-merge-36230
[MIRROR] Pipenet fix
2018-04-01 01:01:42 -05:00
LetterJay
81815605e2 Merge pull request #6213 from Citadel-Station-13/upstream-merge-36840
[MIRROR] Fixes singularity power output
2018-04-01 01:00:07 -05:00
Jordan Brown
d27541d5fb Merge pull request #36840 from 81Denton/singulo-power
Fixes singularity power output
2018-04-01 00:18:37 -05:00
Jordan Brown
7c6845b750 Merge pull request #36824 from Robustin/mblood
Monkeys can now die of bloodloss
2018-04-01 00:17:25 -05:00
LetterJay
c670eaa613 Merge pull request #6202 from Citadel-Station-13/upstream-merge-36836
[MIRROR] Removes empty New()
2018-03-31 19:03:55 -05:00
LetterJay
ecc453a823 Merge pull request #6200 from Citadel-Station-13/upstream-merge-36826
[MIRROR] fixes a drinking glass smash runtime
2018-03-31 19:03:44 -05:00
LetterJay
212e82dece Merge pull request #6199 from Citadel-Station-13/upstream-merge-36783
[MIRROR] Being buckled to an object means space wind wont pull you
2018-03-31 19:03:31 -05:00
LetterJay
38a1a0fca7 Merge pull request #6198 from Citadel-Station-13/upstream-merge-36804
[MIRROR] Fixes silicons being unable to remotely use chemmaster functions
2018-03-31 19:03:13 -05:00
LetterJay
9b913a462b Merge pull request #6197 from Citadel-Station-13/upstream-merge-36796
[MIRROR] Make the delete verb check for SPAWN|DEBUG
2018-03-31 18:44:41 -05:00
LetterJay
dfc437a00f Merge pull request #6196 from Citadel-Station-13/upstream-merge-36805
[MIRROR] Cleans up duplicate chem_master power_change() proc
2018-03-31 18:44:25 -05:00
LetterJay
df8f936cf8 Merge pull request #6195 from Citadel-Station-13/upstream-merge-36803
[MIRROR] [s] Fixes chem dispenser not actually requiring power
2018-03-31 18:44:11 -05:00
LetterJay
d5f94e6ce6 Merge pull request #6194 from Citadel-Station-13/upstream-merge-36794
[MIRROR] Failing to latejoin as a job when the latejoin panel is already open now makes a more descriptive error message
2018-03-31 18:43:53 -05:00
LetterJay
961c69a8e5 Merge pull request #6193 from Citadel-Station-13/upstream-merge-36800
[MIRROR] Adds check to keep observers from being recognized as servants of ratvar
2018-03-31 18:43:34 -05:00
LetterJay
1ff35776a7 Merge pull request #6192 from Citadel-Station-13/upstream-merge-36795
[MIRROR] Fixes custom ticker logic (#36792)
2018-03-31 18:43:06 -05:00
LetterJay
19df345067 Merge pull request #6191 from Citadel-Station-13/upstream-merge-36787
[MIRROR] Removed health cost for Twisted Construction upon casting on a wrong object
2018-03-31 18:42:51 -05:00
LetterJay
54feba8901 Merge pull request #6190 from Citadel-Station-13/upstream-merge-36780
[MIRROR] Fixes OOC ban not applying to admins
2018-03-31 18:42:31 -05:00
LetterJay
e3eda7c49a Merge pull request #6189 from Citadel-Station-13/upstream-merge-36770
[MIRROR] Fixes chem dispenser icon desync
2018-03-31 18:42:09 -05:00
LetterJay
29bd14c0c2 Merge pull request #6187 from Citadel-Station-13/upstream-merge-36827
[MIRROR] Fixes flightsuit active gib runtime
2018-03-31 18:41:55 -05:00
LetterJay
043f05e466 Merge pull request #6186 from Citadel-Station-13/upstream-merge-36785
[MIRROR] Fixes staff of change borgs recieving AI laws
2018-03-31 18:41:24 -05:00
LetterJay
8dfefe3037 Merge pull request #6184 from Citadel-Station-13/upstream-merge-36786
[MIRROR] Fixed table crafting with tools in surrounding area
2018-03-31 18:41:08 -05:00
LetterJay
4e095cec40 Merge pull request #6181 from Citadel-Station-13/upstream-merge-36811
[MIRROR] Removes a unused helper
2018-03-31 18:40:36 -05:00
LetterJay
fa64b72ea6 Merge pull request #6180 from Citadel-Station-13/upstream-merge-36781
[MIRROR] Get_Flat_Human_Icon no longer draws asses that nobody wants
2018-03-31 18:39:15 -05:00
kevinz000
5a6a8c332a Buildmode GC (#36828) 2018-03-31 14:02:54 -07:00
Jordan Brown
d47686c88e Removes empty New() 2018-03-31 09:11:04 -05:00
kevinz000
c932f3ae52 fixes a drinking glass smash runtime (#36826)
* smash runtime

* qdeling
2018-03-31 07:11:44 -05:00
LetterJay
78bc5ed7ef Merge pull request #6173 from Citadel-Station-13/upstream-merge-36772
[MIRROR] Removes derpartment
2018-03-31 06:22:11 -05:00
LetterJay
5fe5f34692 Merge pull request #6172 from Citadel-Station-13/upstream-merge-36679
[MIRROR] Fixes round-end report not generating sometimes.
2018-03-31 06:21:58 -05:00
LetterJay
4f032913c7 Merge pull request #6171 from Citadel-Station-13/upstream-merge-36702
[MIRROR] increases MAX_THROWING_DIST
2018-03-31 06:21:47 -05:00
LetterJay
bfda01ec9f Merge pull request #6170 from Citadel-Station-13/upstream-merge-36763
[MIRROR] Capitalizes pathfinder subsystem
2018-03-31 06:21:29 -05:00