lolman360
|
97e5fbd29f
|
YOU CAN UNPACK IT NOW FOLKS, KATANAS NO LONGER DROPDEL
|
2020-08-24 11:48:22 +10:00 |
|
lolman360
|
d9f1ebd6f5
|
MOVING SOME LINES AROUND FOLKS
|
2020-08-24 11:44:18 +10:00 |
|
lolman360
|
40bcd3f902
|
PACK IT UP FOLKS
|
2020-08-24 11:18:02 +10:00 |
|
lolman360
|
f2a7c2599d
|
Merge remote-tracking branch 'upstream/master' into AnPrimAssistants
|
2020-08-24 09:36:36 +10:00 |
|
silicons
|
a8ee36fe85
|
fixes wormhole jaunters and makes them no longer collide with bohs/other bluespace teleportation disruptors (#13209)
* Update wormhole_jaunter.dm
* Update wormhole_jaunter.dm
|
2020-08-23 21:00:07 +02:00 |
|
silicons
|
1abe2458ee
|
Update taeclowndo.dm (#13227)
|
2020-08-23 20:58:34 +02:00 |
|
lolman360
|
5218840e6d
|
w
|
2020-08-24 02:01:46 +10:00 |
|
lolman360
|
daeaf81ab6
|
e
|
2020-08-24 01:25:26 +10:00 |
|
lolman360
|
69caf7a331
|
ear
|
2020-08-24 00:56:38 +10:00 |
|
lolman360
|
eda8d516b9
|
e
|
2020-08-24 00:41:22 +10:00 |
|
lolman360
|
a032fb4a3d
|
e
|
2020-08-24 00:35:12 +10:00 |
|
lolman360
|
6463d0b785
|
Merge branch 'AnPrimAssistants' of https://github.com/lolman360/Citadel-Station-13 into AnPrimAssistants
|
2020-08-24 00:27:29 +10:00 |
|
lolman360
|
cdc7490ee1
|
e
|
2020-08-24 00:26:26 +10:00 |
|
lolman360
|
1f576dfd12
|
Update smithed_items.dm
|
2020-08-24 00:15:27 +10:00 |
|
lolman360
|
d45ac6323a
|
Update smithed_items.dm
|
2020-08-24 00:09:58 +10:00 |
|
lolman360
|
ccf8aaf412
|
ee
|
2020-08-23 23:53:38 +10:00 |
|
lolman360
|
ce2dca5932
|
Update anvil.dm
|
2020-08-23 22:19:25 +10:00 |
|
silicons
|
2fa023346a
|
Merge pull request #13204 from timothyteakettle/donator-items
adds three t1 donator items
|
2020-08-23 05:08:50 -07:00 |
|
silicons
|
7f942abef2
|
Merge pull request #13239 from zeroisthebiggay/fetishglovesbelike
zero adds black fetish gloves because hes Horny
|
2020-08-23 05:08:14 -07:00 |
|
Putnam3145
|
ecbf8a5dc2
|
Merge pull request #13245 from Arturlang/fortitude_norun
Fortitude walking fix
|
2020-08-23 04:33:51 -07:00 |
|
Artur
|
b47b14cdaa
|
Shoot me please
|
2020-08-23 14:26:07 +03:00 |
|
lolman360
|
e138536cb6
|
eee eee eee
|
2020-08-23 18:29:01 +10:00 |
|
lolman360
|
c8ecfdf4a9
|
Update anvil.dm
|
2020-08-23 17:50:33 +10:00 |
|
lolman360
|
04a755746b
|
oh yeah
|
2020-08-23 17:45:13 +10:00 |
|
lolman360
|
73932b27d2
|
TESTMERGE TIME?
|
2020-08-23 17:43:34 +10:00 |
|
lolman360
|
220546b558
|
you forgot the knife idiot
|
2020-08-23 17:19:30 +10:00 |
|
lolman360
|
ce4d50b9a9
|
E
|
2020-08-23 17:09:13 +10:00 |
|
lolman360
|
bc14155632
|
Merge remote-tracking branch 'upstream/master' into AnPrimAssistants
|
2020-08-23 17:01:45 +10:00 |
|
lolman360
|
1deafc7103
|
its asking me to commit hold on
|
2020-08-23 17:01:32 +10:00 |
|
lolman360
|
2a3ada511e
|
It's all codersprites?
Always has been.
|
2020-08-23 16:51:55 +10:00 |
|
lolman360
|
1146ed0d1f
|
is thsi it
|
2020-08-23 13:12:51 +10: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
|
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 |
|
zerothebigboy
|
21836b4ec8
|
: )
|
2020-08-22 18:11:03 -04:00 |
|
Timothy Teakettle
|
60c8dd283e
|
shitcode begone
|
2020-08-22 20:02:36 +01:00 |
|
DeltaFire
|
bf799472d1
|
fixes the APC access check
|
2020-08-21 19:35:58 +02: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
|
bda2c740ba
|
Merge branch 'master' into AnPrimAssistants
|
2020-08-21 11:08:13 +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
|
921a963e59
|
fix 1
|
2020-08-20 20:26:29 +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 |
|