necromanceranne
|
75e0e893a2
|
Merge branch 'master' into baton_change_pr
|
2021-04-19 10:55:33 +10:00 |
|
silicons
|
0dcc6b44ba
|
Merge pull request #14543 from qweq12yt/cargo-bugfixes
Cargo bugfixes
|
2021-04-18 18:52:54 -06:00 |
|
silicons
|
e8e625cb5c
|
Merge pull request #14603 from Putnam3145/fix-base-option
Activity tracking; traitor class tweaks
|
2021-04-18 18:49:27 -06:00 |
|
DeltaFire
|
f1e1169e85
|
dispenser moment
|
2021-04-13 17:33:04 +02:00 |
|
Putnam
|
4811216f07
|
Activity tracking; traitor class tweaks
|
2021-04-13 06:42:32 -07:00 |
|
qweq12yt
|
7ca46715d7
|
Merge branch 'master' into cargo-bugfixes
|
2021-04-08 19:15:55 -03:00 |
|
SandPoot
|
29bf226fe1
|
upload closets.dm
|
2021-04-06 18:18:08 -03:00 |
|
silicons
|
cbd7e0de6a
|
Merge pull request #14418 from LetterN/perlin-genny
Updates openspace & enables perlin generation on alvaland & icebox/snaxi
|
2021-04-06 04:10:00 -06:00 |
|
Lin
|
c65b1791d0
|
Merge pull request #14547 from SandPoot/lockers-and-laptops
Fixing some issues for laptops and lockers/crates.
|
2021-04-04 23:22:41 -05:00 |
|
SandPoot
|
2381db5f53
|
upload files
|
2021-03-31 12:35:43 -03:00 |
|
LetterN
|
f976a89157
|
Merge remote-tracking branch 'origin/master' into perlin-genny
|
2021-03-31 08:19:31 +08:00 |
|
qweq12yt
|
04f90b749f
|
fixes material crates not shipping
|
2021-03-30 12:33:23 -03:00 |
|
silicons
|
2a7aa8e826
|
Merge pull request #14524 from SandPoot/borgs-buff
Allows borgs to move pulled stuff around like a human
|
2021-03-28 13:48:14 -06:00 |
|
silicons
|
f269a8d35f
|
Merge pull request #14274 from timothyteakettle/disguise
lets ghost cafe residents disguise themselves as any mob or object
|
2021-03-27 01:37:09 -06:00 |
|
SandPoot
|
0994a37af5
|
upload files
|
2021-03-26 11:05:36 -03:00 |
|
LetterN
|
e3fb2d5491
|
Merge remote-tracking branch 'origin/master' into perlin-genny
|
2021-03-24 21:55:47 +08:00 |
|
Lin
|
715f86ef5c
|
Merge pull request #14447 from LetterN/fixes-2
Fixes laptop and tweaks stacks
|
2021-03-22 19:52:42 -05:00 |
|
Lin
|
4e641eedb9
|
Merge pull request #14489 from LetterN/amogus
Fixes NIRM
|
2021-03-22 15:37:56 -05:00 |
|
LetterN
|
760a7de229
|
Merge remote-tracking branch 'origin/master' into fixes-2
|
2021-03-22 09:32:21 +08:00 |
|
LetterN
|
86b8bbf727
|
no more free shipping
|
2021-03-21 21:44:04 +08:00 |
|
silicons
|
6491615775
|
Merge pull request #14461 from Hatterhat/violent-cafe
removes pacifism from ghost cafe
|
2021-03-20 14:28:33 -06:00 |
|
LetterN
|
292f67e098
|
Merge remote-tracking branch 'origin/master' into perlin-genny
|
2021-03-20 20:36:56 +08:00 |
|
silicons
|
d434f60cb3
|
Update closets.dm
|
2021-03-18 16:59:03 -07:00 |
|
Hatterhat
|
dd44ebae46
|
peak funny
|
2021-03-17 16:10:32 -05:00 |
|
LetterN
|
228105b391
|
laptop and closet decon fix
|
2021-03-16 14:47:28 +08:00 |
|
necromanceranne
|
6ebc911937
|
Batons knockdown and slowdown on rightclick, otherwise they stagger, but always do damage. Damage respects melee armor, but power cells grant armor pen based on max charge.
|
2021-03-16 04:48:55 +11:00 |
|
silicons
|
5472186bc2
|
Merge pull request #14398 from LetterN/post-hardsync1.5
post-hardsync1.5
|
2021-03-14 23:30:26 -06:00 |
|
Letter N
|
935e46b492
|
The Mapping Update
Cleans up the map (again)
Makes mining code more better
|
2021-03-12 12:11:35 +08:00 |
|
Letter N
|
59a725c25a
|
icon(s) fixes and fixes boards
|
2021-03-10 11:26:33 +08:00 |
|
silicons
|
58b69786c8
|
Merge pull request #14358 from Hatterhat/femur-breakies
femur breaker actually breaks legs any%
|
2021-03-09 00:18:41 -07:00 |
|
Letter N
|
22b33d1a6e
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-03-07 13:04:36 +08:00 |
|
Hatterhat
|
9b2d62b9ef
|
whoops again
|
2021-03-02 22:09:38 -06:00 |
|
Hatterhat
|
dc5ca7a556
|
oops
|
2021-03-02 22:07:13 -06:00 |
|
Hatterhat
|
053f9ea857
|
any%
|
2021-03-02 22:06:57 -06:00 |
|
keronshb
|
b105556603
|
No Superconductivity with Reinforced Plasma Glass
Removes heat going through RPlasma Glass
|
2021-03-02 21:45:36 -05:00 |
|
Letter N
|
5304029dd9
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-02-23 11:01:42 +08:00 |
|
Timothy Teakettle
|
b2015e4c94
|
blacklist
|
2021-02-21 17:32:07 +00:00 |
|
timothyteakettle
|
deb1a5374d
|
Update ghost_role_spawners.dm
|
2021-02-20 00:33:57 +00:00 |
|
timothyteakettle
|
d34c821db4
|
Update ghost_role_spawners.dm
|
2021-02-19 23:45:01 +00:00 |
|
Timothy Teakettle
|
a444918936
|
Update ghost_role_spawners.dm
|
2021-02-19 23:11:41 +00:00 |
|
SandPoot
|
123de14009
|
upload files
|
2021-02-18 15:05:39 -03:00 |
|
SandPoot
|
f738023097
|
Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
|
2021-02-18 15:04:46 -03:00 |
|
SandPoot
|
cf2e70671a
|
upload files
|
2021-02-18 14:47:10 -03:00 |
|
Letter N
|
de67720a0a
|
icons should exist
|
2021-02-14 11:39:56 +08:00 |
|
Letter N
|
6286d40082
|
code works
|
2021-02-12 17:26:08 +08:00 |
|
Letter N
|
834e4730b3
|
not existing
|
2021-02-09 15:44:49 +08:00 |
|
Letter N
|
f87aa0ac5b
|
toast. And DiscoFox™️
|
2021-02-08 18:46:05 +08:00 |
|
raspy-on-osu
|
622a3df378
|
Merge branch 'master' of https://github.com/raspy-on-osu/Citadel-Station-13 into ventcrawl-refactor
|
2021-01-24 19:21:24 -05:00 |
|
Letter N
|
021b28a2b7
|
cleanup
shitcode - b - gone
|
2021-01-20 11:08:21 +08:00 |
|
silicons
|
dedb0cb62e
|
Merge remote-tracking branch 'citadel/master' into tgsync
|
2021-01-19 04:24:42 -07:00 |
|