Ghommie
d4af57b0a9
Fixing one hell of a gibs runtime.
2020-03-05 01:02:54 +01:00
Ghom and GitHub
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 and GitHub
7a2e0892d3
Merge pull request #11277 from kevinz000/sword_point
...
En garde! (nah just sword pointing)
2020-03-04 17:11:39 +01:00
Ghom and GitHub
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 and GitHub
a2fe9f0d23
Update toys.dm
2020-03-04 17:03:26 +01:00
Ghom and GitHub
0b74bc9da3
Update twohanded.dm
2020-03-04 16:43:57 +01:00
Ghom and GitHub
7c8b490cb3
Update energy.dm
2020-03-04 16:40:28 +01:00
Ghommie
60c7268e37
Also fixing bloodsucker coffins.
2020-03-04 16:29:09 +01:00
Ghommie
f2c8a7cd6f
Porting a couple material datums code updates and fixes.
2020-03-04 15:59:46 +01:00
Ghom and GitHub
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 and GitHub
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 and GitHub
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
Kraseo
4ac2848282
fixes contract target blacklisting
2020-03-04 12:35:36 +01:00
kevinz000 and GitHub
18bdb753d3
bet
2020-03-03 21:13:59 -07:00
kevinz000 and GitHub
0cf7f2e882
Update energy.dm
2020-03-03 21:07:24 -07:00
kevinz000
6354b48659
fix
2020-03-03 20:58:06 -07:00
kevinz000
b6431b0ef6
changes
2020-03-03 20:54:53 -07:00
kevinz000
8b0b685fa7
CHECK_MOBILITY
2020-03-03 20:40:33 -07:00
kevinz000 and GitHub
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
Ghommie
a452cfb31b
ouch
2020-03-03 22:26:56 +01:00
Ghommie
9aa712d84b
Fixes and improves RCL sprite update procs.
2020-03-03 22:19:12 +01:00
Ghom and GitHub
62eef87835
Merge pull request #11289 from Trilbyspaceclone/patch-301
...
Cotton/Durathreads now stack to 80
2020-03-03 21:30:14 +01:00
deathride58
9efdad1d6b
Initial commit - lays out the foundation for a more robust limb icon override system. You're welcome.
2020-03-03 13:55:33 -05: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 and GitHub
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 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
Ghommie