 kevinz000
|
0791f22b62
|
Merge pull request #10702 from Ghommie/Ghommie-cit528
Hey, do you remember that wizard round where everyone tried arming up the nuclear bomb and we all went DELTA RED DELTA RED DELTA RED DELTA ?
|
2020-03-10 17:24:48 -07:00 |
|
|
Ghom
|
8878733fc1
|
Merge pull request #11317 from deathride58/WEPORTINSYNTHSBOI
Ports Skyrat's synths (Plus limb rendering overhaul and more)
|
2020-03-09 00:26:06 +01:00 |
|
|
kevinz000
|
0a68143a3e
|
Merge pull request #11297 from Ghommie/Ghommie-cit597
some dozens lines about some update_overlays issues and cryopods/MMIs.
|
2020-03-06 00:20:54 -07:00 |
|
|
kevinz000
|
16d6ba9e21
|
Merge pull request #11323 from Ghommie/Ghommie-cit600
Porting a couple material datums code updates and fixes.
|
2020-03-06 00:17:21 -07:00 |
|
|
deathride58
|
2e35c09dec
|
Merge pull request #10451 from kevinz000/mobility_flags
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
|
2020-03-05 20:03:56 -05: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 |
|
|
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
|
6354b48659
|
fix
|
2020-03-03 20:58:06 -07:00 |
|
|
kevinz000
|
8b0b685fa7
|
CHECK_MOBILITY
|
2020-03-03 20:40:33 -07:00 |
|
|
kevinz000
|
90188c51bf
|
Merge pull request #11308 from Putnam3145/stop-lag
Removes lag
|
2020-03-03 20:28:47 -07: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 |
|
|
kevinz000
|
1e99cd0bfe
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-03-03 03:08:41 -07: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 |
|
|
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
|
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 |
|
|
Ghom
|
4d4708a6ae
|
Update cloning.dm
|
2020-03-02 01:28:20 +01:00 |
|
|
Ghommie
|
efaa99ae27
|
some dozens lines about PDA/update_overlays and cryopods/MMIs.
|
2020-03-01 23:17:35 +01: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 |
|
|
ancientpower
|
5c5ec541ae
|
Merge branch 'master' into paramedic-tweaks
|
2020-02-29 01:55:46 -06:00 |
|
|
Ghom
|
c9a5f49623
|
Fixing a whoopsie with airlocks.
|
2020-02-28 17:28:02 +01: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 |
|
|
Ghommie
|
fc76cd9a9b
|
Porting update_icon improvements. Part 1.
|
2020-02-27 01:21:03 +01:00 |
|
|
kevinz000
|
59e95555bb
|
Merge remote-tracking branch 'citadel/master' into staves
|
2020-02-24 13:09:45 -07:00 |
|
|
Ghom
|
9355e9319b
|
Merge pull request #11110 from Hatterhat/hyper-96-aus-unk
you kids like extend votes?
|
2020-02-24 16:39:16 +01:00 |
|
|
kevinz000
|
43c17b4ab3
|
Merge pull request #11180 from Detective-Google/psych+paramedic
Adds epic and also cool paramedics [lazy tg port]
|
2020-02-24 02:30:36 -07:00 |
|
|
kevinz000
|
73c03adbbb
|
Merge pull request #11199 from Detective-Google/pai.pai.pai.png
Lets pAIs hold encryption keys and play music.
|
2020-02-24 02:23:17 -07:00 |
|
|
Ghommie
|
2b740f9bad
|
[s] Fixing an issue with slot machines crashing the server.
|
2020-02-23 13:09:21 +01:00 |
|
|
Hatterhat
|
b89a2314a2
|
mmm that's compiling i don't like that
|
2020-02-22 16:17:51 -06:00 |
|
|
kevinz000
|
f6542b381c
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 23:29:25 -07:00 |
|
|
Detective Google
|
ca29246878
|
adds the loudness booster(instruments) and Encryption key slot to pAIs. (lazy tg port 2.)
|
2020-02-22 00:02:49 -06:00 |
|
|
Ghommie
|
8fbfd07692
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-22 00:55:32 +01:00 |
|
|
Detective Google
|
4c10c830bf
|
Merge remote-tracking branch 'upstream/master' into psych+paramedic
|
2020-02-20 22:17:55 -06:00 |
|
|
Detective Google
|
a8f863f901
|
changes - sprites
|
2020-02-20 22:17:47 -06:00 |
|
|
Ghom
|
0f8f6e417b
|
Merge branch 'master' into Ghommie-cit528
|
2020-02-21 02:40:22 +01:00 |
|
|
kevinz000
|
c7273c03be
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-19 19:12:27 -07:00 |
|
|
kevinz000
|
3e073f160c
|
Merge pull request #10910 from Citadel-Station-13/Ghommie-patch-6
Fixing a little issue with sleeper UI and blood types.
|
2020-02-19 19:00:32 -07:00 |
|
|
kevinz000
|
0e4692c63d
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-18 18:16:34 -07:00 |
|
|
Ghommie
|
698f0b8177
|
Something about pAIs and silicon access priviledges.
|
2020-02-18 16:20:44 +01:00 |
|
|
kevinz000
|
d7949e810e
|
Merge remote-tracking branch 'citadel/master' into staves
|
2020-02-18 02:20:58 -07:00 |
|
|
kevinz000
|
14fdd90618
|
Nerfs public autolathes (#10970)
|
2020-02-16 07:37:24 +01:00 |
|
|
kevinz000
|
36cebc733c
|
Merge pull request #11039 from Ghommie/Ghommie-cit572
Something about a couple runtimes.
|
2020-02-15 12:19:50 -07:00 |
|
|
kevinz000
|
7ee04aa608
|
Merge pull request #10998 from Ghommie/Ghommie-cit569
Something about the in operator and spaceDMM version update.
|
2020-02-15 12:17:37 -07:00 |
|
|
kevinz000
|
ee9b38017e
|
Merge pull request #10995 from Ghommie/Ghommie-cit568
Something about cryopods.
|
2020-02-15 12:17:02 -07:00 |
|
|
kevinz000
|
f79148d549
|
Merge pull request #10947 from Ghommie/Ghommie-cit563
Holopad static fix and a few other mistakes.
|
2020-02-15 12:16:23 -07:00 |
|