KathrinBailey
a240daaca2
Final changes
...
Puts curtain crafting under plastic to stop plastic duping. You can deep rods and cloth, but the cost is 10 plastic sheets and it doesn't drop 10 plastic sheets so it's a loss.
2020-03-03 13:19:15 +00:00
Ghom and GitHub
f9a2326437
Merge pull request #11203 from Trilbyspaceclone/poster
...
Three new posters!
2020-03-03 13:29:54 +01:00
kevinz000
1e99cd0bfe
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-03-03 03:08:41 -07:00
kevinz000
c21bd60929
fix
2020-03-03 03:04:23 -07:00
Lin and GitHub
fde24492b9
Merge pull request #11294 from Ghommie/Ghommie-cit596
...
An old oversight with disease/var/viable_mobtypes.
2020-03-02 18:31:25 -06:00
Kraseo
4315a4d1b7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties
2020-03-02 23:06:29 +01:00
Ghom and GitHub
c984cd7677
Merge pull request #11270 from ancientpower/paramedic-tweaks
...
Paramedic tweaks (sprites/access/stuff for future use)
2020-03-02 22:46:49 +01:00
Putnam
3cba19dea7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into stop-lag
2020-03-02 11:24:49 -08:00
Putnam
eefba5ce00
Removes lag
2020-03-02 11:24:46 -08:00
Ghommie
f08d79767b
Removes makeshift switchblades
2020-03-02 19:33:31 +01:00
Kraseo
50a1feeb89
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties
2020-03-02 17:38:08 +01:00
Ghommie
23cbb05578
Merge branch 'Ghommie-cit597' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit597
2020-03-02 16:33:56 +01:00
Ghommie
f915d14a58
Also cell chargers and cloning pods.
2020-03-02 16:28:31 +01:00
kevinz000 and GitHub
e1f3985309
Update musician.dm
2020-03-02 05:33:48 -07:00
kevinz000 and GitHub
92e95f816a
Update defib.dm
2020-03-02 03:49:21 -07:00
Kraseo
41e4de9287
fixes telebatons runtiming and not being able to be extended
2020-03-02 02:47:21 +01:00
Kraseo
508511cb86
actually makes contractor pinpointer do things
2020-03-02 01:36:11 +01:00
Ghom and GitHub
4d4708a6ae
Update cloning.dm
2020-03-02 01:28:20 +01:00
Kraseo
7206e5ee6e
nearly forgot these as well
2020-03-01 23:31:14 +01:00
Ghommie
efaa99ae27
some dozens lines about PDA/update_overlays and cryopods/MMIs.
2020-03-01 23:17:35 +01:00
Kraseo
e3c77f2f5a
part 4: the one where i slowly go insane
2020-03-01 22:05:35 +01:00
ancientpower
56ba8ef127
requested changes
2020-03-01 12:45:00 -06:00
Kraseo
ab48a6fa16
part 3: do people even read commit logs
2020-03-01 19:14:05 +01:00
Kraseo
d93ade7e03
part 2: bloody tendency
2020-03-01 17:37:18 +01:00
Kraseo
38f7821dd6
part 1: battle stream
2020-03-01 16:56:13 +01:00
Ghommie
c0ff43f827
ofc, New arguments.
2020-03-01 16:34:43 +01:00
Ghommie
b0922dd70d
Actually..
2020-03-01 16:02:58 +01:00
KathrinBailey
d817442f02
It works!
...
Everything works now.
2020-03-01 13:42:14 +00:00
Ghom and GitHub
3ec80872f0
Merge pull request #11279 from Hatterhat/tg-45232-lavariver
...
tgstation 45232 - lava rivers can no longer be plasma'd for basalt
2020-03-01 13:55:03 +01:00
KathrinBailey
72d3572ec3
New sofas added, need to be added to sheet_types.dm still
...
Backing up the .dmi changes and two comfy chairs.
2020-03-01 11:58:59 +00:00
Trilbyspaceclone and GitHub
71c26c287e
Update sheet_types.dm
2020-03-01 01:55:03 -05:00
5c2bf70fe7
Update code/game/objects/items/shields.dm
...
Co-Authored-By: Arturlang <arturpaavooskari.lang@gmail.com >
2020-03-01 00:48:45 -05:00
12ea1132c4
Apply suggestions from code review
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-03-01 00:43:34 -05:00
Trilbyspaceclone and GitHub
dd36688e9a
Update watercloset.dm
2020-02-29 03:31:42 -05:00
Trilbyspaceclone and GitHub
612f8d97d5
Update sheet_types.dm
2020-02-29 03:29:08 -05:00
ancientpower and GitHub
5c5ec541ae
Merge branch 'master' into paramedic-tweaks
2020-02-29 01:55:46 -06:00
Hatterhat
727ec433f3
funny story my byond crashes every compile
2020-02-29 01:47:59 -06:00
Lin and GitHub
d32cc370ad
Merge pull request #11177 from Citadel-Station-13/Ghommie-patch-1
...
Broom shenanigeans.
2020-02-29 00:22:24 -06:00
Lin and GitHub
5ee4a355c1
Merge pull request #11178 from Citadel-Station-13/Ghommie-patch-2
...
Fixing refrigerators locking when closed
2020-02-29 00:21:43 -06:00
Hatterhat
1577a00ab5
tg 45232
2020-02-28 21:54:55 -06:00
kevinz000 and GitHub
ba55351e4a
Update twohanded.dm
2020-02-28 13:43:11 -07:00
kevinz000
93d91b1808
Merge remote-tracking branch 'citadel/master' into sword_point
2020-02-28 13:39:56 -07:00
kevinz000
8ef68fa36b
En garde!
2020-02-28 13:35:41 -07:00
Ghom and GitHub
d5c2c54f32
Update fancy.dm
2020-02-28 19:14:58 +01:00
Ghom and GitHub
c9a5f49623
Fixing a whoopsie with airlocks.
2020-02-28 17:28:02 +01:00
kevinz000 and GitHub
e39d7fa49d
Merge pull request #11259 from Ghommie/Ghommie-cit590
...
Porting update_icon improvements.
2020-02-28 04:30:12 -07:00
kevinz000 and GitHub
25f86c18d1
Merge pull request #11260 from Kraseo/i-hate-gangs
...
Removes soporific sniper rifle rounds from gang uplinks
2020-02-28 04:29:22 -07:00
ancientpower
12ba71f588
paramedic tweaks
2020-02-27 23:23:44 -06:00
kevinz000
56eab760fc
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-27 20:11:36 -07:00
kevinz000
045d5b2dbf
fixes
2020-02-27 20:06:52 -07:00
KathrinBailey