 Linzolle
|
f828f4c4b7
|
Merge remote-tracking branch 'forrest/wewlad' into tos-compliance
|
2020-04-14 17:33:47 -05:00 |
|
|
Ghommie
|
571584901c
|
Custom skin tone preferences.
|
2020-04-14 19:10:28 +02:00 |
|
|
Ghom
|
55402b1834
|
Merge branch 'master' into Ghommie-cit679
|
2020-04-14 16:22:00 +02:00 |
|
|
Ghom
|
49e36e47ff
|
Merge pull request #11809 from kevinz000/storage_rework
Adds baystation-style volumetric space storage support
|
2020-04-14 13:17:11 +02:00 |
|
|
Artur
|
356f2913d7
|
Ghommies suggestions and renames a proc
|
2020-04-14 09:30:14 +03:00 |
|
|
Artur
|
f910a0fd32
|
Conflict fixes
|
2020-04-14 09:27:54 +03:00 |
|
|
Ghommie
|
e753c1ad14
|
Fixed a little peeve with random bodies.
|
2020-04-14 02:20:19 +02:00 |
|
|
Putnam
|
70b771a8f2
|
Also made bellies only generate when needed.
|
2020-04-13 17:04:09 -07:00 |
|
|
Putnam
|
1e8fffbf0b
|
Replaced all the extraneous flags with bitflags
|
2020-04-13 16:47:43 -07:00 |
|
|
Ghommie
|
db43f53ac4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611
|
2020-04-13 16:15:40 +02:00 |
|
|
kevinz000
|
105d405d2d
|
Merge pull request #11837 from Ghommie/Ghommie-cit678
Item color removal port fixes.
|
2020-04-12 22:34:45 -07:00 |
|
|
kevinz000
|
d6544af144
|
Update status_procs.dm
|
2020-04-12 22:25:46 -07:00 |
|
|
Ghommie
|
0d0f14d3f8
|
Item color removal port fixes.
|
2020-04-13 03:34:58 +02:00 |
|
|
kevinz000
|
6b6683846b
|
Merge pull request #11819 from Ghommie/Ghommie-cit672
Minor action datum refactor and spellcasting fix.
|
2020-04-12 17:02:36 -07:00 |
|
|
kevinz000
|
8604297dcd
|
Merge pull request #11811 from Ghommie/Ghommie-cit671
Fixes and standarizes a few liver troubles. Re-enables liver failure.
|
2020-04-12 17:01:50 -07:00 |
|
|
Ghommie
|
05a954f000
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611
|
2020-04-13 02:01:01 +02:00 |
|
|
kevinz000
|
d60932ca5d
|
Merge pull request #11697 from Ghommie/Ghommie-cit655
Ports "Obliterates item_color: new washing machine functionality edition"
|
2020-04-12 16:16:37 -07:00 |
|
|
Ghom
|
b00e97b848
|
Merge pull request #10732 from kevinz000/eldritch_affairs
Eldritch Affairs
|
2020-04-12 20:47:19 +02:00 |
|
|
kevinz000
|
0ea1e557db
|
ok
|
2020-04-11 19:31:19 -07:00 |
|
|
Ghom
|
1babc75a69
|
Merge pull request #11818 from spookydonut/patch-1
Update spacemandmm to 1.4
|
2020-04-11 23:59:31 +02:00 |
|
|
kevinz000
|
4e8f771e2c
|
]
|
2020-04-11 09:15:03 -07:00 |
|
|
kevinz000
|
238665f464
|
progress
|
2020-04-11 09:13:10 -07:00 |
|
|
kevinz000
|
c1f5ad310b
|
wew
|
2020-04-11 09:01:51 -07:00 |
|
|
kevinz000
|
eacc783f09
|
k
|
2020-04-11 08:23:25 -07:00 |
|
|
Ghommie
|
31e0321808
|
Minor action datum refactor and spellcasting fix.
|
2020-04-11 16:53:08 +02:00 |
|
|
kevinz000
|
b39eb60c4a
|
shield bashing
|
2020-04-11 07:30:23 -07:00 |
|
|
kevinz000
|
8132db65b1
|
interrupt funtion
|
2020-04-11 05:59:11 -07:00 |
|
|
kevinz000
|
f8a7a68ac3
|
lmao
|
2020-04-11 05:52:37 -07:00 |
|
|
kevinz000
|
76e93d504a
|
this massive proc lmao
|
2020-04-11 05:15:50 -07:00 |
|
|
kevinz000
|
234687c5c8
|
do_after_advanced
|
2020-04-11 05:10:07 -07:00 |
|
|
Ghom
|
f9f1bbc05f
|
Merge pull request #11804 from Akrilla/beepsky-tie
Fixes beepsky ziptie weirdness
|
2020-04-11 13:40:24 +02:00 |
|
|
kevinz000
|
99edc1e1a5
|
make it compile for blocking test
|
2020-04-11 03:40:52 -07:00 |
|
|
spookydonut
|
230e5fca20
|
fix everything
|
2020-04-11 15:32:09 +08:00 |
|
|
kevinz000
|
d44d5168d8
|
progress..
|
2020-04-10 22:50:53 -07:00 |
|
|
Akrilla
|
8abc0cc0a7
|
!on
|
2020-04-11 05:24:24 +01:00 |
|
|
Ghom
|
a75bd30911
|
Update carbon_defense.dm
|
2020-04-10 19:54:12 +02:00 |
|
|
Artur
|
f481be1496
|
Makin stuff nice and dandy
|
2020-04-10 20:53:28 +03:00 |
|
|
kevinz000
|
d5769a6ee4
|
Update carbon_defense.dm (#11738)
|
2020-04-10 18:13:50 +02:00 |
|
|
Ghommie
|
af55880794
|
Fixes and standarizes a few liver troubles. Re-enables liver failure.
|
2020-04-10 17:22:34 +02:00 |
|
|
Akrilla
|
2a05903808
|
do_after
|
2020-04-10 04:26:35 +01:00 |
|
|
ForrestWick
|
0a54f8a7a0
|
I'M SORRY MR GITHUB PLS DONT BEAT ME
|
2020-04-09 17:27:18 -05:00 |
|
|
Artur
|
fe755a1424
|
Tackling Working so far, working on the lunge now
|
2020-04-09 21:42:00 +03:00 |
|
|
kevinz000
|
0cd7437f49
|
Update status_procs.dm
|
2020-04-09 09:33:21 -07:00 |
|
|
Ghommie
|
7c1e5aa2c9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655
|
2020-04-09 15:46:19 +02:00 |
|
|
Ghommie
|
d2b624a908
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667
|
2020-04-09 14:59:40 +02:00 |
|
|
Putnam3145
|
5078b5875a
|
Fixes my oldish badcode. (#11781)
|
2020-04-09 14:48:58 +02:00 |
|
|
kevinz000
|
956a85ab34
|
Merge pull request #11741 from necromanceranne/pawnch_2_the_pawnchening
Punch Changes 2: The Quickening
|
2020-04-09 02:09:51 -07:00 |
|
|
kevinz000
|
3c4c397c46
|
Merge remote-tracking branch 'citadel/master' into combat_rework
|
2020-04-08 04:04:45 -07:00 |
|
|
kevinz000
|
7ec669ecd4
|
bet
|
2020-04-07 16:11:58 -07:00 |
|
|
Lin
|
8379169b81
|
Merge pull request #11476 from kevinz000/shield_refactor
Completely overhauls how blocking, shields, reflecting, and anything in between is handled. Has some small gameplay effects.
|
2020-04-07 20:47:15 +00:00 |
|