Commit Graph

24549 Commits

Author SHA1 Message Date
The0bserver
5869ddb1cd Real Fix, Real Fox (I hope.) 2020-09-01 06:55:15 -04:00
The0bserver
7d2d7f84dd a fix for a fox. 2020-09-01 06:49:05 -04:00
The0bserver
6673779ca2 Hi. Someone needs to fix up circuits. Not me tho. 2020-09-01 06:46:31 -04:00
The0bserver
457cb5e238 THIS IS IT LUIGI! ALL REAGENTS SET! 2020-09-01 06:44:46 -04:00
The0bserver
82ffb64268 maybe? 2020-09-01 02:53:29 -04:00
The0bserver
a89d6cd125 I hate circuits. They hate change. 2020-09-01 02:47:05 -04:00
The0bserver
e36f93baeb Sorry, Circuits. (Only slightly.) 2020-09-01 02:42:43 -04:00
The0bserver
89b837461e This should squash the error. 2020-09-01 02:32:28 -04:00
The0bserver
75854915ee You open the door. There's a green bean. 2020-09-01 02:27:15 -04:00
The0bserver
2c6cfd2115 YOU CAN'T STOP ME FROM DREAMING! 2020-09-01 02:19:37 -04:00
The0bserver
d504d45839 Cat Roomba... (Further solidification of instab) 2020-09-01 01:27:22 -04:00
The0bserver
df3c2d3d8d Reduced some bloat, using TRAY_NAME_UPDATE 2020-08-31 05:01:51 -04:00
The0bserver
b13db43985 Let's not forget this. 2020-08-31 03:27:56 -04:00
The0bserver
dbb6ef7d4e I think we got rid of nutrilevel, finally. 2020-08-31 03:26:43 -04:00
The0bserver
4edf61dde7 New Define File: Botany.dm Earthmother save me. 2020-08-31 00:34:45 -04:00
The0bserver
c2002aca78 This is it, Luigi. We gotta move the function! 2020-08-30 12:44:12 -04:00
The0bserver
af97bddf87 It begins. Earthmother preserve me. 2020-08-30 11:38:46 -04:00
silicons
188bb13272 Merge pull request #13181 from Putnam3145/dynnamic
Dynamic: tweaks and fixes: the reckoning
2020-08-22 15:22:19 -07:00
silicons
c7c74e7c51 Merge pull request #13213 from lolman360/breath
breath mask balaclava
2020-08-22 15:22:04 -07:00
silicons
876dc36dbc Merge pull request #13201 from kiwedespars/return-the-punch
makes it so you can craft armwraps roundstart again.
2020-08-22 15:21:22 -07:00
silicons
68ee7b12bf Merge pull request #13236 from timothyteakettle/lizard-fixes
lizards are shitcode
2020-08-22 15:19:48 -07:00
silicons
a4aeb38433 Merge pull request #13221 from Ludox235/fuck-lowpop-xenos
>10 pop xenos >FOR (ALLEGEDLY) 5 YEARS
2020-08-22 15:19:21 -07:00
silicons
7737e76b32 Merge pull request #13224 from Ghommie/Ghommie-cit835
Removing priority overlays, update_icon() splitup for guns.
2020-08-22 15:19:07 -07:00
silicons
5c09004dc1 Merge pull request #13228 from DeltaFire15/apc-ui-access-fixes
Fixes silicons and ratvarians accessing APCs
2020-08-22 15:19:00 -07:00
Timothy Teakettle
60c8dd283e shitcode begone 2020-08-22 20:02:36 +01:00
kiwedespars
055d397e1e adds tape 2020-08-21 13:34:02 -07:00
DeltaFire
bf799472d1 fixes the APC access check 2020-08-21 19:35:58 +02:00
zerothebigboy
5d611155f1 a 2020-08-21 02:15:30 -04:00
zerothebigboy
5741db4a13 Merge branch 'thefunnytemporalkatanas' of https://github.com/zeroisthebiggay/Citadel-Station-13 into thefunnytemporalkatanas
# Conflicts:
#	code/game/objects/items/weaponry.dm
2020-08-21 02:13:44 -04:00
zerothebigboy
a9abdeb044 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into thefunnytemporalkatanas 2020-08-21 02:10:03 -04:00
zerothebigboy
421e32f3f9 a final touch up 2020-08-21 02:06:36 -04:00
zerothebigboy
cca7e66457 a slight blink flavor 2020-08-21 01:54:09 -04:00
zeroisthebiggay
a183fb3165 Update weaponry.dm
thats an extra space
2020-08-21 01:45:23 -04:00
zeroisthebiggay
7f036428bd Update weaponry.dm
thats an extra space
2020-08-21 01:40:19 -04:00
zerothebigboy
b960f4055d a 2020-08-21 01:31:30 -04:00
silicons
120bcfc00c Merge pull request #13178 from lolman360/plumb
[READY] ports plumbing (no more waiting for tgui4)
2020-08-20 21:32:26 -07:00
lolman360
623fe1cb69 Update recipes_clothing.dm 2020-08-21 12:00:09 +10:00
Ghom
cd10655985 fix 2 2020-08-20 23:02:13 +02:00
Timothy Teakettle
88fb9d277a fix lizard snouts (#13223) 2020-08-20 22:58:54 +02:00
Ghommie
c39764afde Merge branch 'Ghommie-cit835' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit835 2020-08-20 20:28:46 +02:00
Ghommie
921a963e59 fix 1 2020-08-20 20:26:29 +02:00
Ghom
1242626faa Forgot the comment. 2020-08-20 19:01:13 +02:00
Ghommie
fde859bca0 Removing priority overlays, update_icon() splitup for guns. 2020-08-20 18:33:23 +02:00
Timothy Teakettle
bc16a8f1b2 fix lizard snouts 2020-08-20 16:39:07 +01:00
Ludox
d51af28f77 Bumps min-pop to 25
Ahahah 3 years that we can have 10 pop xenos :)
2020-08-20 14:39:04 +02:00
silicons
11467e1cae Merge pull request #13212 from Putnam3145/reftrack
Ports reftracking from TG.
2020-08-19 22:03:16 -07:00
silicons
91484356c5 Merge pull request #13183 from SmArtKar/shuttle_hotfix
Shuttle hotfix so now you can make huge shuttle things
2020-08-19 21:03:58 -07:00
silicons
0e2e4fdaf7 Merge pull request #13199 from lolman360/haha
[READY] tested code
2020-08-19 21:03:21 -07:00
silicons
8a1cf1b860 Merge pull request #13208 from timothyteakettle/fuck
fixes two snout paths
2020-08-19 19:56:12 -07:00
silicons
5414a8949c Update text.dm 2020-08-19 08:50:26 -07:00