Trilbyspaceclone
|
9b2991d0f2
|
Update recipes_misc.dm
|
2019-06-05 20:05:22 -04:00 |
|
Trilbyspaceclone
|
e922a0cb18
|
Update recipes_sandwich.dm
|
2019-06-05 20:04:40 -04:00 |
|
Trilbyspaceclone
|
b68565280e
|
Update snacks_other.dm
|
2019-06-05 20:02:22 -04:00 |
|
Trilbyspaceclone
|
03132569a7
|
Update backpack.dm
|
2019-06-05 15:54:51 -04:00 |
|
Ghommie
|
a49692ba06
|
Thanks for the review.
|
2019-06-05 21:25:18 +02:00 |
|
BurgerLua
|
8778349821
|
added
|
2019-06-05 11:43:28 -07:00 |
|
kevinz000
|
7decce3808
|
Merge pull request #8525 from Trilbyspaceclone/patch-161
Makes cookies loved by all
|
2019-06-05 11:35:22 -07:00 |
|
kevinz000
|
0d97361dea
|
Merge pull request #8430 from Trilbyspaceclone/bad_idea
Adds improvised 7.62 rifle
|
2019-06-05 11:31:10 -07:00 |
|
kevinz000
|
6e4a3c71f9
|
Merge pull request #8532 from Poojawa/WHYBYOND
Without this, everyone is broken
|
2019-06-05 11:30:09 -07:00 |
|
dtfe3
|
3de6e2d71a
|
twintails...
title
|
2019-06-05 19:41:23 +02:00 |
|
Ghommie
|
af2598035a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
|
2019-06-05 19:32:17 +02:00 |
|
dtfe3
|
d1d0f38460
|
Revert "test"
|
2019-06-05 19:29:53 +02:00 |
|
Ghommie
|
0513f3464a
|
one
|
2019-06-05 19:20:25 +02:00 |
|
deathride58
|
98304e4975
|
Merge pull request #8424 from Arturlang/CTRL-Alt-Click-port
Ctrl Alt Click on pipes, port from TG
|
2019-06-05 12:54:36 -04:00 |
|
dtfe3
|
2e47c973c6
|
Pink Panties
|
2019-06-05 16:15:38 +02:00 |
|
Poojawa
|
27ef3ce281
|
Without this, everyone is broken
|
2019-06-05 08:10:20 -05:00 |
|
Trilbyspaceclone
|
f6c7eeb4da
|
Update mining_tools.dm
|
2019-06-05 09:06:47 -04:00 |
|
kevinz000
|
2c84d75ae6
|
Merge pull request #8528 from Poojawa/marking-mysteries
Fixes prosthetic invisible hands, improves female markings
|
2019-06-05 02:02:40 -07:00 |
|
kevinz000
|
980c48180c
|
Merge pull request #8387 from JTGSZ/gangs
Ports gang mode
|
2019-06-05 01:55:19 -07:00 |
|
kevinz000
|
cc2d3a7f10
|
Merge pull request #8516 from Ghommie/Ghommie-cit26
Makes clockwork wall - sonic jackhammer interaction account the wall's superheating.
|
2019-06-05 01:53:34 -07:00 |
|
kevinz000
|
89bf36e6a9
|
Merge pull request #8491 from Ghommie/Ghommie-cit24
zero, , null, and empty text strings, all fulfill the ! operator.
|
2019-06-05 01:52:17 -07:00 |
|
kevinz000
|
3ab46405b8
|
Merge pull request #8489 from Coolgat3/tacticalwear
Makes combat gloves look T A C T I C O O L
|
2019-06-05 01:49:57 -07:00 |
|
kevinz000
|
98491cd2f8
|
Merge pull request #8504 from Trilbyspaceclone/patch-160
buffs resonator
|
2019-06-05 01:49:11 -07:00 |
|
kevinz000
|
cd38a29449
|
Merge pull request #8506 from CalamaBanana/Elf-Ears-and-Deer-taurs-for-mammals
Ports RP's deer taur and adds Elven ears to mammals
|
2019-06-05 01:44:05 -07:00 |
|
kevinz000
|
adbbb2944a
|
Merge pull request #8517 from Poojawa/shitcode-is-so-bad-and-people-like-it-I-guess
Adds visible balls and multi-breasts
|
2019-06-05 01:42:48 -07:00 |
|
kevinz000
|
102d68a243
|
Merge pull request #8518 from Ghommie/Ghommie-cit27
Fixes and updates pod's emergency suits storage.
|
2019-06-05 01:41:23 -07:00 |
|
kevinz000
|
52b189dc98
|
Merge pull request #8502 from Sishen1542/meatyors
Meteor Sats not exclusive to station goal
|
2019-06-05 01:40:50 -07:00 |
|
kevinz000
|
58bdac6965
|
Merge pull request #8524 from BurgerLUA/Ass-Blast-USA
Adds a trait that makes you immune to ass slapping: BUNS OF STEEL.
|
2019-06-05 01:40:28 -07:00 |
|
kevinz000
|
81ba2011d3
|
Merge pull request #8510 from Sishen1542/ghostmanbad
Subtle 2: No Ghost Boogaloo
|
2019-06-05 01:32:42 -07:00 |
|
Poojawa
|
a2b4f4261c
|
Fixes missing hands and marking overlap
cleans up the code a bit too. Improves female chest sprites.
|
2019-06-05 02:33:25 -05:00 |
|
Poojawa
|
b053fe3c86
|
Probably fixes synth hand issues
|
2019-06-04 23:36:58 -05:00 |
|
Fermi
|
228ab5b7c9
|
+Acute hepatic pharmacokinesis. (untested, will test with alterations)CC
|
2019-06-05 00:23:42 +01:00 |
|
Trilbyspaceclone
|
da67bdf63d
|
>_>
|
2019-06-04 12:40:29 -04:00 |
|
Trilbyspaceclone
|
7fb1f7fba1
|
Update snacks_pastry.dm
|
2019-06-03 18:38:55 -04:00 |
|
deathride58
|
b95b14d033
|
Merge pull request #8515 from Ghommie/Ghommie-cit25
Fixes stunbatons' icons not properly updating on cell fiddling, plus cell maxcharge leniency.
|
2019-06-03 17:51:13 -04:00 |
|
BurgerLua
|
ed7d0575b2
|
Ass Blast USA
|
2019-06-03 14:40:57 -07:00 |
|
Useroth
|
ebb820ed38
|
Made the changeling tentacle disarm a bit more reliable.
|
2019-06-03 22:56:01 +02:00 |
|
kevinz000
|
fc1611d86a
|
Merge pull request #8426 from Sishen1542/sloom-hnngh
Slimespeak!
|
2019-06-03 00:51:36 -07:00 |
|
BurgerLua
|
c98d2ce5a0
|
nuke be gone
|
2019-06-02 15:21:45 -07:00 |
|
Fermi
|
255aa60441
|
Final pooj changes.
|
2019-06-02 22:57:50 +01:00 |
|
Fermi
|
0eec1ed3f3
|
Pooj changes.
|
2019-06-02 22:49:04 +01:00 |
|
Fermi
|
a5b3ec7939
|
Acid changes.
|
2019-06-02 22:38:55 +01:00 |
|
Fermi
|
a3e60843bc
|
Renamed blood trait and spelt minutes right.
|
2019-06-02 22:35:16 +01:00 |
|
Fermi
|
4513dd9815
|
MINUTE define changes.
|
2019-06-02 22:26:53 +01:00 |
|
Ghommie
|
6be3496d36
|
Merge branch 'Ghommie-cit15' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit15
|
2019-06-02 22:50:02 +02:00 |
|
Ghommie
|
a0898a779a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit15
|
2019-06-02 22:48:38 +02:00 |
|
Fermi
|
1a73cf6efe
|
This is why you compile test.
|
2019-06-02 21:09:31 +01:00 |
|
Fermi
|
c11d2bac80
|
Okay, now it checks the right thing.
|
2019-06-02 21:03:16 +01:00 |
|
Fermi
|
5b56225b72
|
Wait how can the dead inspect?
|
2019-06-02 21:01:05 +01:00 |
|
Thalpy
|
e0690c610a
|
Added a check to ensure empath target isn't dead.
|
2019-06-02 20:53:41 +01:00 |
|