lolman360
|
519592693b
|
e
|
2020-08-25 19:01:07 +10:00 |
|
lolman360
|
c79f63bd00
|
e
|
2020-08-25 18:54:22 +10:00 |
|
lolman360
|
0ff85deddf
|
Merge remote-tracking branch 'upstream/master' into AnPrimAssistants
|
2020-08-25 01:25:34 +10:00 |
|
lolman360
|
b5c000cac4
|
eee
|
2020-08-24 23:48:45 +10:00 |
|
lolman360
|
4e82ce87eb
|
EEEEEEEEEEEEe
|
2020-08-24 23:43:42 +10:00 |
|
lolman360
|
a2f33d27a2
|
ee
|
2020-08-24 23:42:39 +10:00 |
|
lolman360
|
dcbdc05c5a
|
Update smithed_items.dm
|
2020-08-24 23:31:21 +10:00 |
|
lolman360
|
30471d4171
|
Merge branch 'AnPrimAssistants' of https://github.com/lolman360/Citadel-Station-13 into AnPrimAssistants
|
2020-08-24 21:08:00 +10:00 |
|
lolman360
|
e646b3af32
|
bet
|
2020-08-24 21:03:11 +10:00 |
|
lolman360
|
9d9a6d0d5d
|
Update anvil.dm
|
2020-08-24 20:33:21 +10:00 |
|
lolman360
|
e8379eb6a2
|
whoops
|
2020-08-24 19:11:01 +10:00 |
|
lolman360
|
2df3bbd822
|
r
|
2020-08-24 18:55:48 +10:00 |
|
lolman360
|
94e24a9738
|
anvillan
|
2020-08-24 17:52:42 +10:00 |
|
lolman360
|
ff5c4d779f
|
ok
|
2020-08-24 13:19:05 +10:00 |
|
lolman360
|
579d7bb4f2
|
whoops!
|
2020-08-24 12:49:54 +10:00 |
|
lolman360
|
037b939f55
|
THIS WAS THE PROBLEM THE ENTIRE TIME
|
2020-08-24 12:36:17 +10:00 |
|
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 |
|
silicons
|
40b489006d
|
Merge pull request #13225 from raspy-on-osu/teg-castration
Heavily nerfs the TEG.
|
2020-08-23 17:52:44 -07:00 |
|
silicons
|
64968bd655
|
Merge pull request #13242 from Literallynotpickles/coat-sensors
lets you equip handheld crew monitors on all med winter coats
|
2020-08-23 17:41:10 -07:00 |
|
silicons
|
f0bcab1143
|
Merge pull request #13241 from Putnam3145/voreeject
Made all death release vore contents, not just gibbing/dusting
|
2020-08-23 17:39:43 -07:00 |
|
silicons
|
f86daefa4e
|
Merge pull request #13240 from timothyteakettle/ipcs-spark-when-blush
ipcs make fake electrical sparks when they blush or cry
|
2020-08-23 17:36:23 -07:00 |
|
silicons
|
82d8b7266f
|
Merge pull request #13238 from Hatterhat/insidious-tackle
insidious combat gloves but they can tackle now
|
2020-08-23 17:36:03 -07: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 |
|