Commit Graph

19666 Commits

Author SHA1 Message Date
kevinz000
18910a23a2 Merge pull request #10881 from Ghommie/Ghommie-cit552
Refactoring mob holders into an element.
2020-02-06 00:41:28 -07:00
kevinz000
73aa761c69 Merge pull request #10700 from Ghommie/Ghommie-cit526
Anomalous honking crystal pet peeve & co.
2020-02-06 00:38:31 -07:00
kevinz000
1288a463cf Merge pull request #10772 from Ghommie/Ghommie-cit537
Removing unused vore files and commented out code.
2020-02-06 00:37:52 -07:00
kevinz000
ead2be5116 Merge pull request #10919 from Ghommie/Ghommie-cit556
Fixing accidental nerfs to the magpistol.
2020-02-06 00:36:59 -07:00
kevinz000
842a5cccf3 varnames 2020-02-06 00:34:24 -07:00
kevinz000
db4a0ebb3f pathing 2020-02-06 00:32:19 -07:00
kevinz000
3019f0d0fc path 2020-02-06 00:29:36 -07:00
kevinz000
6eae30cb66 whoops 2020-02-06 00:25:27 -07:00
kevinz000
7921013f56 news reading 2020-02-06 00:24:55 -07:00
kevinz000
38536cd02d repath that 2020-02-06 00:05:07 -07:00
kevinz000
134b7b811d repath that 2020-02-06 00:04:11 -07:00
kevinz000
9a4432b3ac initial commit 2020-02-06 00:03:17 -07:00
kevinz000
927b9d0622 Revert "Merge pull request #10883 from ancientpower/ghost-newscasters"
This reverts commit 3c5a3cb4d4, reversing
changes made to 109b15ebdd.
2020-02-05 23:50:41 -07:00
kevinz000
3c5a3cb4d4 Merge pull request #10883 from ancientpower/ghost-newscasters
Allows ghosts to read newscasters and books
2020-02-05 23:46:04 -07:00
kevinz000
e0dd12ecbd Merge pull request #10902 from Citadel-Station-13/Ghommie-patch-1
Fixes some mounted defibrillator issue.
2020-02-05 23:45:45 -07:00
kevinz000
cda01e10f6 Merge pull request #10885 from Ghommie/Ghommie-cit553
Removing a couple troublesome NSFW useless and unused preferences.
2020-02-05 23:45:30 -07:00
kevinz000
50cabc3c64 Merge pull request #10889 from Ghommie/Ghommie-cit555
runtime drifting
2020-02-05 23:44:52 -07:00
kevinz000
d0cd33a5ea Merge pull request #10899 from Trilbyspaceclone/vender-hate
Almost all venders now can be restocked
2020-02-05 23:44:30 -07:00
kevinz000
27d3fcf5fd Merge pull request #10900 from Putnam3145/port-atmos-fix
Ports atmos priority reaction mix from TG
2020-02-05 23:44:08 -07:00
kevinz000
5059c0fa8c Merge pull request #10905 from Hatterhat/engishit
consoleless interfaces default, standard RCD ammo added to industrial engi
2020-02-05 23:43:54 -07:00
kevinz000
51bc7a5dec Merge pull request #10909 from Citadel-Station-13/Ghommie-patch-3
Fixes the panic bunker persistence.
2020-02-05 23:43:05 -07:00
Ghom
181944bb36 Update admin_ranks.dm 2020-02-06 03:07:42 +01:00
r4d6
10490e1c15 3 minutes it is 2020-02-05 21:03:34 -05:00
r4d6
8430ee3684 Timer 2-5 minutes 2020-02-05 20:58:26 -05:00
Hatterhat
f100b6c5e4 multitools in basic tools, dumb headers 2020-02-05 19:47:20 -06:00
Ghommie
639ec8066d Another typecheck 2020-02-06 02:19:14 +01:00
Ghommie
60b6d96f45 typecheck. 2020-02-06 02:17:51 +01:00
Ghommie
8131a60f3a Oh. 2020-02-06 02:10:03 +01:00
Ghommie
523e080f87 Double-esword and hypereuplastic blade toys are sharp now blunt. 2020-02-06 02:09:27 +01:00
Ghommie
a3e2ec372f Makes it compile also custom emote fix. 2020-02-06 01:40:14 +01:00
Ghommie
233ed5873f race conditions and turfs beings special. 2020-02-06 01:13:28 +01:00
Seris02
26e16d7c89 yeet 2020-02-06 07:49:19 +08:00
keronshb
5d1d652ea4 Buffs the Pirate Ship to be bomb proof
Title, also makes a few computers/machines indestructible and buffs turret health.  It also allows turrets to be repairable now.
2020-02-05 18:28:00 -05:00
Ghommie
ab06c23a2b runtime is forever, errors are eternal. 2020-02-05 23:48:17 +01:00
Arturlang
23834ce3f5 Parent call
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-02-05 22:54:01 +02:00
Artur
78339881de Wierd ass formatting causing tabs to betray me 2020-02-05 21:37:36 +01:00
Ghom
84f91cf665 Update shuttle.dm 2020-02-05 21:33:37 +01:00
kevinz000
98c721fffc Update cart.dm 2020-02-05 13:29:31 -07:00
Ghom
e14d2caacc Update shuttle.dm 2020-02-05 21:20:49 +01:00
Ghommie
01d8086ebd Lavaland's Herald speech fix. 2020-02-05 21:12:15 +01:00
Artur
c2b68d0ba3 Adds debbuging 2020-02-05 20:35:24 +01:00
Artur
5602289013 Parent call
Failed to get in the previous commit for some reason.
2020-02-05 20:25:04 +01:00
Artur
9951f291fd Reviewer suggestions 2020-02-05 20:14:35 +01:00
Artur
f0b22a119d Interface routing and modifying uplink component 2020-02-05 20:03:36 +01:00
Ghom
6d78d01612 Merge pull request #10903 from Hatterhat/tg-47770
fuck organ decay - tgstation#47770
2020-02-05 19:26:40 +01:00
Ghom
69c4cde323 Merge pull request #10915 from Citadel-Station-13/kevinz000-patch-5
jackboot magpistols are a thing again
2020-02-05 19:22:36 +01:00
Ghom
deb1686ce2 Merge pull request #10911 from Tupinambis/StunbatonFUCK
Addendum to PR #10812. REGEN STAMINA WHATEVER FUCK COMBAT REWORK IS CONFUSING
2020-02-05 19:19:41 +01:00
Ghommie
7e2ad2b71f Fixing accidental nerfs to the magpistol. 2020-02-05 18:45:15 +01:00
Ghom
7e8bc10b8e Merge pull request #10894 from Trilbyspaceclone/carps
Buffs carps again
2020-02-05 18:32:18 +01:00
Artur
8b5e3e6004 Removes the shitty verb 2020-02-05 14:55:47 +01:00