 Ghom
|
bceca18626
|
Merge pull request #11839 from Citadel-Station-13/kevinz000-patch-1
you can no longer knock out xenomorphs by punching them in the face i guess
|
2020-04-16 19:04:16 +02:00 |
|
|
Ghom
|
747672eb50
|
Update update_icons.dm
|
2020-04-16 16:44:07 +02:00 |
|
|
Ghommie
|
42b67d9240
|
PR is ready.
|
2020-04-16 16:33:04 +02:00 |
|
|
Ghommie
|
fe43581d31
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667
|
2020-04-16 15:09:52 +02:00 |
|
|
Ghommie
|
7193efa613
|
Fixing some doggie issues.
|
2020-04-16 05:29:17 +02:00 |
|
|
kevinz000
|
e533103ed2
|
Merge branch 'master' into shield_bashing
|
2020-04-15 19:34:08 -07:00 |
|
|
Ghommie
|
e588b504c1
|
work.
|
2020-04-16 04:09:20 +02:00 |
|
|
Ghommie
|
3533ceb4ed
|
I'm tired.
|
2020-04-16 03:55:53 +02:00 |
|
|
Ghommie
|
586966ea51
|
General refactor for some snowflake bodyparts procs and taurs.
|
2020-04-16 03:37:52 +02:00 |
|
|
necromanceranne
|
61df831216
|
also makes martial artists spend stamina on disarm aaah
|
2020-04-15 20:07:01 +10:00 |
|
|
Artur
|
2134515d5c
|
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
|
2020-04-15 12:19:37 +03:00 |
|
|
necromanceranne
|
d0d766efb5
|
Some balance alterations to make pugilism actually worth a damn, lets you craft armwraps (magic ones too if you want to go to the effort), and also buffs some stamina damage on various martial arts
|
2020-04-15 19:00:01 +10:00 |
|
|
kevinz000
|
20c3c648ce
|
Update living.dm
|
2020-04-14 21:50:39 -07:00 |
|
|
Linzolle
|
d43cb78b8b
|
one more
|
2020-04-14 18:02:51 -05:00 |
|
|
Linzolle
|
39e6541ccd
|
remove bad words
|
2020-04-14 17:54:07 -05:00 |
|
|
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 |
|