 lolman360andGitHub
|
e2e7133eba
|
ew things are called different things
|
2019-08-11 14:54:17 +10:00 |
|
|
Poojawa
|
2b2bdb37ba
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
|
2019-08-10 23:26:20 -05:00 |
|
|
BlackMajorandGitHub
|
5dcd419d8a
|
Merge pull request #8356 from Thalpy/master
[READY] FermiChem! Adds a new reaction mechanic, 9 new chems and a few extra features to accommodate the new chems.
|
2019-08-11 16:09:23 +12:00 |
|
|
lolman360andGitHub
|
22b461c78f
|
Merge pull request #1 from lolman360/master
d
|
2019-08-11 12:00:55 +10:00 |
|
|
lolman360andGitHub
|
e4a9f2743b
|
and gitbabby
|
2019-08-11 11:14:07 +10:00 |
|
|
lolman360andGitHub
|
aa71a39fa8
|
so basically im monky
|
2019-08-11 11:13:38 +10:00 |
|
|
lolman360andGitHub
|
2c1add5276
|
all my other comimits were to master
|
2019-08-11 11:13:02 +10:00 |
|
|
lolman360andGitHub
|
f131104a73
|
Add files via upload
|
2019-08-11 10:51:38 +10:00 |
|
|
Poojawa
|
d496e16dde
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
|
2019-08-10 19:14:41 -05:00 |
|
|
Sishen
|
234d058cc2
|
Update mecha_control_console.dm
|
2019-08-10 07:28:35 -04:00 |
|
|
kevinz000andGitHub
|
40b89f49cc
|
Merge pull request #9078 from kappa-sama/moth1
Changes teleporter machines to apply flyperson (more) equally
|
2019-08-09 22:22:29 -07:00 |
|
|
kevinz000andGitHub
|
b3b22029a6
|
Merge pull request #9064 from cebutris/hugloves
Hugs of the North Star
|
2019-08-09 22:20:18 -07:00 |
|
|
kevinz000andGitHub
|
74008beb8f
|
Merge pull request #9066 from Ghommie/Ghommie-cit181
Two lines fixes for invisible zipties and borked legcuffs.
|
2019-08-09 22:17:31 -07:00 |
|
|
kevinz000andGitHub
|
14033d9876
|
Merge pull request #9085 from Ghommie/Ghommie-cit186
underwear colors fix 2: The revenge of the crunch.
|
2019-08-09 22:15:55 -07:00 |
|
|
Sishen
|
b8907c2f97
|
fixing what i forgot to do
|
2019-08-09 13:47:36 -04:00 |
|
|
Fermi
|
02b5100be7
|
Made scans advanced.
|
2019-08-09 13:01:14 +01:00 |
|
|
Fermi
|
6e0303fdba
|
Actual fix for #9091
|
2019-08-09 12:48:26 +01:00 |
|
|
Fermi
|
34cfd2c1e3
|
Fix for #9091
|
2019-08-09 12:12:25 +01:00 |
|
|
Sishen
|
c6fbb966c8
|
honk
|
2019-08-09 03:55:08 -04:00 |
|
|
Sishen
|
dc66446064
|
dab dab
|
2019-08-09 03:19:02 -04:00 |
|
|
Sishen
|
4ba3d851ed
|
IT JUST WORKS
|
2019-08-09 00:46:14 -04:00 |
|
|
Ghommie
|
ee57720ee3
|
underwear colors fix 2: The revenge of the crunch.
|
2019-08-09 05:11:12 +02:00 |
|
|
Poojawa
|
f76bb27127
|
Fixes some runtimes and removes a holodeck exploit
and a cleanup >.>;
|
2019-08-08 21:33:42 -05:00 |
|
|
Ghommie
|
12c4fc139d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151
|
2019-08-09 04:00:23 +02:00 |
|
|
kappa-samaandGitHub
|
a8e4ce1f77
|
Merge branch 'master' into moth1
|
2019-08-08 18:27:34 -04:00 |
|
|
Ghommie
|
a7287ed4d1
|
Merge branch 'moth1' of https://github.com/kappa-sama/Citadel-Station-13 into Ghommie-cit185
|
2019-08-08 23:11:58 +02:00 |
|
|
Ghommie
|
a9eeb28fff
|
Uncalibrated teleporters can now turn furries, scalies & co into flypeople too.
|
2019-08-08 21:09:11 +02:00 |
|
|
kappa-sama
|
2dc15b3fc0
|
Update teleporter.dm
|
2019-08-08 15:05:48 -04:00 |
|
|
kevinz000andGitHub
|
290dfb8bbd
|
Merge pull request #9071 from YakumoChen/cloningnerf
Nerfs Autocloning
|
2019-08-08 02:00:37 -07:00 |
|
|
kevinz000andGitHub
|
ad7189a211
|
Merge pull request #9061 from deathride58/fuckfemurbreakers
Makes the femur breaker use the proper scream emote and makes the femur breaker guarantee the victim falls into crit
|
2019-08-08 01:59:51 -07:00 |
|
|
kappa-sama
|
73e31aba04
|
Revert "Update teleporter.dm"
This reverts commit 5fcb94d8d6.
|
2019-08-08 02:55:27 -04:00 |
|
|
kappa-sama
|
42c37d9de3
|
Revert "Update teleporter.dm"
This reverts commit 2b3e53d7d6.
|
2019-08-08 02:55:24 -04:00 |
|
|
kappa-sama
|
85dc61f84d
|
Revert "Update teleporter.dm"
This reverts commit c963f5e43e.
|
2019-08-08 02:55:14 -04:00 |
|
|
kappa-sama
|
c963f5e43e
|
Update teleporter.dm
|
2019-08-08 02:40:51 -04:00 |
|
|
kappa-sama
|
2b3e53d7d6
|
Update teleporter.dm
|
2019-08-08 02:23:59 -04:00 |
|
|
kappa-sama
|
5fcb94d8d6
|
Update teleporter.dm
|
2019-08-08 02:12:31 -04:00 |
|
|
kappa-samaandGitHub
|
f38ac0dfbf
|
possibly makes teleporter hate all races equally
let's go
|
2019-08-08 01:49:06 -04:00 |
|
|
Sishen
|
f59b60e83a
|
QOL OOGA BOOGA
|
2019-08-08 01:11:20 -04:00 |
|
|
Fermi
|
7391581a26
|
2 small fixes.
|
2019-08-07 11:33:53 +01:00 |
|
|
Fermi
|
2a049e3485
|
Should fix the locker conflict! (untested)
|
2019-08-07 09:40:13 +01:00 |
|
|
ThalpyandGitHub
|
2256bbb63c
|
Merge branch 'master' into master
|
2019-08-07 09:30:53 +01:00 |
|
|
YakumoChenandGitHub
|
deeda9ebdb
|
Update cloning.dm
|
2019-08-07 07:53:14 +00:00 |
|
|
kevinz000andGitHub
|
df60e21449
|
Update misc_walls.dm
|
2019-08-07 00:20:28 -07:00 |
|
|
Ghommie
|
de8137d6c8
|
One line fix for invisible zipties.
|
2019-08-06 23:19:28 +02:00 |
|
|
Cebutris
|
3e6112fec0
|
adds the hug gloves to the arcade reward pool
|
2019-08-06 16:48:49 -04:00 |
|
|
Fermi
|
ee1b04eefb
|
Fixes potential "trapped as ghost" problems and examine+scanner text
|
2019-08-06 19:54:07 +01:00 |
|
|
deathride58andGitHub
|
ddb29551fc
|
paren
|
2019-08-06 11:28:01 -04:00 |
|
|
deathride58
|
ee0d7a4ed3
|
Fixes issues with femur breaker by replacing the forced speech with a proper scream emote and making it guarantee landing in crit
|
2019-08-06 07:43:28 -04:00 |
|
|
Sishen
|
decbd37ced
|
Update closets.dm
|
2019-08-06 03:49:08 -04:00 |
|
|
ThalpyandGitHub
|
5795f6bbe2
|
Merge branch 'master' into master
|
2019-08-05 09:09:36 +01:00 |
|