kevinz000
|
763c835a53
|
bitflags not equals
|
2020-03-16 04:26:19 -07:00 |
|
kevinz000
|
2a9e4bebdd
|
priority
|
2020-03-16 04:24:18 -07:00 |
|
kevinz000
|
69374c64c9
|
k
|
2020-03-16 04:18:22 -07:00 |
|
kevinz000
|
857f793600
|
ok
|
2020-03-16 04:12:54 -07:00 |
|
kevinz000
|
644273beca
|
k
|
2020-03-16 04:09:25 -07:00 |
|
kevinz000
|
94db06509c
|
slight desword reflect meme buff
|
2020-03-16 03:50:26 -07:00 |
|
kevinz000
|
d32bff7815
|
return list
|
2020-03-16 03:35:10 -07:00 |
|
kevinz000
|
09e1be9651
|
block args
|
2020-03-16 03:32:12 -07:00 |
|
kevinz000
|
703fca5f90
|
add owner argument
|
2020-03-16 03:24:19 -07:00 |
|
kevinz000
|
5d2fb654e8
|
k
|
2020-03-16 03:23:09 -07:00 |
|
kevinz000
|
9ead492bb0
|
changes
|
2020-03-16 00:28:18 -07:00 |
|
kevinz000
|
4d0677daa9
|
s
|
2020-03-14 21:48:23 -07:00 |
|
kevinz000
|
2113b63428
|
o boy
|
2020-03-14 21:42:23 -07:00 |
|
kevinz000
|
1a061a5d3e
|
agony
|
2020-03-14 21:14:56 -07:00 |
|
kevinz000
|
d4131912e9
|
Merge pull request #11452 from Citadel-Station-13/Linzolle-patch-1
make the CMO hypokit not literally worse than normal ones
|
2020-03-14 09:11:58 -07:00 |
|
Lin
|
0ca58b5ed8
|
why though
|
2020-03-13 04:19:20 +00:00 |
|
Ghommie
|
0876a1eef6
|
Porting datum components system updates.
|
2020-03-12 18:22:26 +01:00 |
|
kevinz000
|
87928d43ea
|
stamcrit check for fireaxe afterattack() (#11426)
* Update twohanded.dm
* Update twohanded.dm
|
2020-03-12 14:21:47 +01:00 |
|
kevinz000
|
0b6c5b7960
|
Update twohanded.dm
|
2020-03-11 18:19:09 -07:00 |
|
kevinz000
|
54713dc1e4
|
Merge pull request #11408 from necromanceranne/sleeping_carp_port
Refactors Martial Arts code, human_defense, and ports New Sleeping Carp
|
2020-03-11 17:26:33 -07:00 |
|
kevinz000
|
69c21f4b76
|
Merge pull request #10327 from Seris02/tggenetics
ports tg genetics
|
2020-03-11 17:01:37 -07:00 |
|
Putnam3145
|
480eb32c68
|
Merge pull request #11418 from Ghommie/Ghommie-cit615
Fix runtimes some more.
|
2020-03-11 17:01:13 -07:00 |
|
kevinz000
|
0d80c8c169
|
Merge pull request #11412 from Citadel-Station-13/Ghommie-patch-2
RCL inhands wires fix.
|
2020-03-11 17:01:01 -07:00 |
|
Ghom
|
0d7612dcf5
|
[s] Sanitizes ParseSong tempo.
|
2020-03-11 00:29:31 +01:00 |
|
Ghommie
|
27a7f754c4
|
Fix runtimes some more.
|
2020-03-10 22:40:06 +01:00 |
|
Ghom
|
b03af0ea9a
|
Update RCL.dm
|
2020-03-10 14:44:33 +01:00 |
|
kevinz000
|
832d894e92
|
Merge pull request #11388 from Owai-Seek/crabby-patty-3/1/20
Food Ports / Butter Bear / Food Craft Speed
|
2020-03-10 05:59:24 -07:00 |
|
kevinz000
|
e210f7d535
|
Merge pull request #11391 from Ghommie/Ghommie-cit612
Porting "Further update_icon splitup"
|
2020-03-10 05:58:17 -07:00 |
|
kevinz000
|
3eac86cf31
|
Merge pull request #11394 from Citadel-Station-13/Ghommie-patch-3
Actually fixing that one overlay.
|
2020-03-10 05:57:18 -07:00 |
|
kevinz000
|
bfb75eb26b
|
Merge pull request #11396 from Ghommie/Ghommie-cit613
Ports "Switches out the three billion args of electrocute act for flags"
|
2020-03-10 05:56:28 -07:00 |
|
necromanceranne
|
b03d83926a
|
Forgot the scroll
|
2020-03-10 20:27:40 +11:00 |
|
Ghommie
|
4143c1963c
|
Porting more legcuffs / bola fixes etcetera
|
2020-03-09 16:20:51 +01:00 |
|
Seris02
|
cccd0e9eef
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2020-03-09 16:49:32 +08:00 |
|
Ghommie
|
ee1eea8874
|
Ports "Switches out the three billion args of electrocute act for flags"
|
2020-03-09 04:01:23 +01:00 |
|
Ghom
|
f8c18fe5a8
|
Update PDA.dm
|
2020-03-09 00:52:11 +01:00 |
|
Ghom
|
1c5aa2f933
|
Merge pull request #11377 from Kraseo/contractor-fixes
Some contractor adjustments & fixes
|
2020-03-09 00:26:54 +01:00 |
|
Winter Flare
|
bb9066e9cb
|
Food Additions / Butter Bear
Ports the following from TG:
Chicken Nugget Box
Crab Burger, Bisque, French Onion Soup, Crab Rangoo
Butter Bear aka Terrygold
Tweaks Bisque and Crab Rangoo recipie.
Removes Bacon from Exotic Meat crate.
Adds Spider Eggs to Exotic Meat crate.
|
2020-03-08 14:36:08 -04:00 |
|
Ghommie
|
ad4d290ea7
|
WIP
|
2020-03-08 19:26:01 +01:00 |
|
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 |
|
Kraseo
|
bbf43b0464
|
whoopsies almost forgot this
|
2020-03-07 20:48:04 +01:00 |
|
Kraseo
|
a5ef41c0fc
|
adjust numbers, fix shuttle dropoffs
|
2020-03-07 20:31:49 +01:00 |
|