kevinz000
|
b2235e03a7
|
Merge pull request #11372 from Ghommie/Ghommie-cit610
Of runtimes and null.
|
2020-03-08 11:10:02 -07:00 |
|
kevinz000
|
2b99f729e6
|
Merge pull request #11384 from Citadel-Station-13/Ghommie-patch-3
I forgot to delete a line on the (now working) PDA overlays fix.
|
2020-03-08 11:09:17 -07:00 |
|
kevinz000
|
c736568a5a
|
Merge pull request #11369 from Ghommie/Ghommie-cit609
Porting the musician and curator beacons.
|
2020-03-08 07:34:48 -07:00 |
|
Ghom
|
57ba56d3bc
|
Update handcuffs.dm
|
2020-03-08 14:09:59 +01:00 |
|
Ghom
|
d25ec08da8
|
Update PDA.dm
|
2020-03-08 07:13:08 +01:00 |
|
Ghommie
|
10c8dbbb6e
|
hOLd oN
|
2020-03-08 02:47:38 +01:00 |
|
Ghommie
|
e23e478c06
|
mOre rUntIMeS
|
2020-03-08 02:43:35 +01:00 |
|
Ghommie
|
5bcb38c79f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit610
|
2020-03-08 02:33:27 +01:00 |
|
Ghom
|
3e9b998866
|
Merge pull request #11360 from Citadel-Station-13/kevinz000-patch-23
Stunbaton disarm mode also works on disarm intent now
|
2020-03-08 01:39:53 +01:00 |
|
kevinz000
|
7115c96f9d
|
Merge branch 'master' into gc_debugging
|
2020-03-07 15:30:47 -08:00 |
|
kevinz000
|
02a488f507
|
Merge pull request #11340 from Ghommie/Ghommie-cit605
Porting movespeed modifiers code updates.
|
2020-03-07 03:26:48 -07:00 |
|
Ghommie
|
7bed0d5c87
|
Of runtimes and null.
|
2020-03-07 01:57:15 +01:00 |
|
Ghommie
|
a817bd6115
|
Porting the musician and curator beacons.
|
2020-03-07 00:12:50 +01:00 |
|
kevinz000
|
a669e87db1
|
Merge branch 'master' into gc_debugging
|
2020-03-06 10:14:19 -07:00 |
|
kevinz000
|
93d995eb18
|
k
|
2020-03-06 10:13:11 -07:00 |
|
Ghom
|
c6c676ceb5
|
Merge pull request #11298 from Kraseo/contracties
Ports TG's Syndicate Contractors
|
2020-03-06 15:23:30 +01:00 |
|
kevinz000
|
c2822dd885
|
Update stunbaton.dm
|
2020-03-06 07:23:29 -07:00 |
|
kevinz000
|
0afaf6794c
|
Update stunbaton.dm
|
2020-03-06 07:21:52 -07:00 |
|
Ghom
|
f24c7fb142
|
Merge pull request #11222 from Trilbyspaceclone/ashwalkers
Ashwalkers now can make a well, got their livestock back and more!
|
2020-03-06 13:48:03 +01:00 |
|
Kraseo
|
ad20fb1a0e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties
|
2020-03-06 11:58:11 +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
|
29727b2fc9
|
Merge pull request #11306 from Ghommie/Ghommie-cit598
Removes makeshift switchblades
|
2020-03-06 00:20:36 -07:00 |
|
kevinz000
|
f1d9725bd8
|
Merge pull request #11319 from Ghommie/Ghommie-cit599
Fixes and improves RCL sprite update procs.
|
2020-03-06 00:17:53 -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 |
|
kevinz000
|
dac74ccf2d
|
Merge pull request #11331 from Ghommie/Ghommie-cit602
Fixing one hell of a gibs runtime.
|
2020-03-06 00:14:28 -07:00 |
|
Ghom
|
859cde2065
|
Update watercloset.dm
|
2020-03-06 05:43:31 +01:00 |
|
Ghommie
|
0c4af362bc
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit605
|
2020-03-06 04:00:36 +01:00 |
|
Ghommie
|
e484f72d7b
|
Ports movespeed modifiers code updates.
|
2020-03-06 03:35:56 +01: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 |
|
Ghom
|
5e603c1cce
|
Merge pull request #11064 from Trilbyspaceclone/more_implants
3 new arm tool set implants
|
2020-03-06 01:25:02 +01:00 |
|
Ghommie
|
d4af57b0a9
|
Fixing one hell of a gibs runtime.
|
2020-03-05 01:02:54 +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 |
|
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
|
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
|
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 |
|
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 |
|