Ghom
d78cdb9b37
Merge pull request #11130 from BlackMajor/SpaceRuins
...
Enables space ruin generation in the station z-level. Adds new ruins for the sake of station ruins.
2020-03-04 23:46:10 +01:00
Ghom
7a2e0892d3
Merge pull request #11277 from kevinz000/sword_point
...
En garde! (nah just sword pointing)
2020-03-04 17:11:39 +01:00
Ghom
6dd27506e1
Merge pull request #11303 from Citadel-Station-13/kevinz000-patch-22
...
what the fuck you mean music line too long??
2020-03-04 17:11:12 +01:00
Ghom
a2fe9f0d23
Update toys.dm
2020-03-04 17:03:26 +01:00
Ghom
0b74bc9da3
Update twohanded.dm
2020-03-04 16:43:57 +01:00
Ghom
7c8b490cb3
Update energy.dm
2020-03-04 16:40:28 +01:00
Ghom
976080d7b2
Merge pull request #11314 from KathrinBailey/Kat-Furniture
...
Kat Furniture! New sofas, chess pieces, nine new posters and shower curtain functionality!
2020-03-04 15:40:01 +01:00
Ghom
8c6b5b49c5
Update contraband.dm
2020-03-04 15:39:23 +01:00
KathrinBailey
11750b4fa9
removed redundant icon line
2020-03-04 14:16:27 +00:00
kevinz000
f67fa08f0f
Merge pull request #11274 from Citadel-Station-13/Ghommie-patch-5
...
Fixing a whoopsie with airlocks.
2020-03-04 05:58:44 -07:00
kevinz000
18bdb753d3
bet
2020-03-03 21:13:59 -07:00
kevinz000
0cf7f2e882
Update energy.dm
2020-03-03 21:07:24 -07:00
kevinz000
90188c51bf
Merge pull request #11308 from Putnam3145/stop-lag
...
Removes lag
2020-03-03 20:28:47 -07:00
KathrinBailey
97733e464d
ghommie change and armrest bug fix
2020-03-04 01:35:00 +00:00
Ghom
62eef87835
Merge pull request #11289 from Trilbyspaceclone/patch-301
...
Cotton/Durathreads now stack to 80
2020-03-03 21:30:14 +01:00
KathrinBailey
86790c69a5
credits accidently left out previously
...
re-adds nod to CEV Eris for their original sprites.
2020-03-03 14:38:16 +00:00
KathrinBailey
7e0abda3c1
fixing merge conflicts
...
includes trillby's new posters.
2020-03-03 13:56:01 +00:00
KathrinBailey
83ec1e428c
Merge remote-tracking branch 'upstream/master' into Kat-Furniture
2020-03-03 13:48:18 +00:00
KathrinBailey
fe7742637f
fixing merge conflicts aaahh
2020-03-03 13:47:58 +00:00
Trilbyspaceclone
d32b6ad7e9
ok
2020-03-03 08:47:17 -05:00
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
f9a2326437
Merge pull request #11203 from Trilbyspaceclone/poster
...
Three new posters!
2020-03-03 13:29:54 +01:00
Lin
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
Ghom
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
kevinz000
e1f3985309
Update musician.dm
2020-03-02 05:33:48 -07:00
kevinz000
92e95f816a
Update defib.dm
2020-03-02 03:49:21 -07:00
ancientpower
56ba8ef127
requested changes
2020-03-01 12:45:00 -06: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
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
71c26c287e
Update sheet_types.dm
2020-03-01 01:55:03 -05:00
Trilbyspaceclone
12ea1132c4
Apply suggestions from code review
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-03-01 00:43:34 -05:00
ancientpower
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
d32cc370ad
Merge pull request #11177 from Citadel-Station-13/Ghommie-patch-1
...
Broom shenanigeans.
2020-02-29 00:22:24 -06:00
Lin
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
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
d5c2c54f32
Update fancy.dm
2020-02-28 19:14:58 +01:00
Ghom
c9a5f49623
Fixing a whoopsie with airlocks.
2020-02-28 17:28:02 +01:00
kevinz000
e39d7fa49d
Merge pull request #11259 from Ghommie/Ghommie-cit590
...
Porting update_icon improvements.
2020-02-28 04:30:12 -07:00
kevinz000
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
Ghom
ebe16768d4
Merge pull request #11249 from Trilbyspaceclone/patch-298
...
Corrects bar stool name
2020-02-27 12:40:41 +01:00
