LetterJay
|
dbaca1843d
|
Merge pull request #570 from Citadel-Station-13/upstream-merge-26539
[MIRROR] The blood loss change everyone's been raving about
|
2017-04-26 06:30:00 -05:00 |
|
LetterJay
|
417b80bb42
|
Merge pull request #516 from Verkister/master
Bringing back the dogborgos.
|
2017-04-26 06:24:26 -05:00 |
|
Verkister
|
265805afe6
|
Fixed dogborg pounce.
|
2017-04-26 13:27:36 +03:00 |
|
CitadelStationBot
|
1542ac40c4
|
Removes an unused var
|
2017-04-25 23:33:13 -05:00 |
|
CitadelStationBot
|
5f09fa4de8
|
The blood loss change everyone's been raving about
|
2017-04-25 23:13:45 -05:00 |
|
LetterJay
|
5d4afa23bc
|
Merge pull request #561 from Citadel-Station-13/upstream-merge-25093
[MIRROR] Refactors T-Ray Scanners
|
2017-04-25 22:29:57 -05:00 |
|
LetterJay
|
b492fccffa
|
removes rogue proc
|
2017-04-25 22:15:07 -05:00 |
|
LetterJay
|
df1bbddc9a
|
Merge pull request #499 from TalkingCactus/let-the-bodies-hit-the-floor
Fixes Initializations
|
2017-04-25 22:03:32 -05:00 |
|
LetterJay
|
f70e00d8cd
|
Merge pull request #531 from Citadel-Station-13/upstream-merge-26441
[MIRROR] Plasmamen tongues, plasmaman lung sprites
|
2017-04-25 22:00:26 -05:00 |
|
LetterJay
|
6b303ccecc
|
/tg/ has tongues in their own file, maybe we should too?
|
2017-04-25 21:52:13 -05:00 |
|
LetterJay
|
73456c9e9a
|
REJECT CLEANUP. FUUUUUUUUUUUUUUUUUUCK.
|
2017-04-25 21:40:46 -05:00 |
|
LetterJay
|
6dc70fc02f
|
Merge pull request #526 from Citadel-Station-13/upstream-merge-26289
[MIRROR] Changed alternate appearances to /datum/atom_hud s
|
2017-04-25 21:39:14 -05:00 |
|
LetterJay
|
feb3569d13
|
mob.dm manual merge
|
2017-04-25 21:25:08 -05:00 |
|
LetterJay
|
993bea0342
|
Merge pull request #560 from Citadel-Station-13/upstream-merge-26480
[MIRROR] Piggybacking on humans now takes a 1.5 second delay before you actually grab on
|
2017-04-25 21:16:01 -05:00 |
|
LetterJay
|
16c4f0da66
|
Merge pull request #563 from Citadel-Station-13/upstream-merge-26420
[MIRROR] Dance Machine ~Fixes~
|
2017-04-25 20:36:43 -05:00 |
|
LetterJay
|
87611ef7c1
|
Merge pull request #564 from Citadel-Station-13/upstream-merge-26584
[MIRROR] Fixes monkey transformation instantly killing a person
|
2017-04-25 20:36:02 -05:00 |
|
LetterJay
|
2102b20409
|
Merge pull request #562 from Citadel-Station-13/upstream-merge-26507
[MIRROR] Removes a few spawns
|
2017-04-25 20:35:42 -05:00 |
|
LetterJay
|
5cf9268498
|
Merge pull request #559 from Citadel-Station-13/upstream-merge-26380
[MIRROR] Examining a window gives tips for construction/deconstruction
|
2017-04-25 20:35:14 -05:00 |
|
LetterJay
|
213799bfc3
|
Merge pull request #558 from Citadel-Station-13/upstream-merge-26522
[MIRROR] Fixes alien spit visual not disappearing
|
2017-04-25 20:34:30 -05:00 |
|
LetterJay
|
6fa7305e27
|
Delete slime.dm.rej
|
2017-04-25 20:33:07 -05:00 |
|
LetterJay
|
b8ed1fc43e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2017-04-25 20:27:20 -05:00 |
|
LetterJay
|
0a77dfcce5
|
manual merge for slime.dm
|
2017-04-25 20:23:00 -05:00 |
|
LetterJay
|
fd26d0eccd
|
Merge pull request #555 from Citadel-Station-13/upstream-merge-26501
[MIRROR] Small abductors refactor
|
2017-04-25 20:10:20 -05:00 |
|
LetterJay
|
081d935114
|
Merge pull request #553 from Citadel-Station-13/upstream-merge-26497
[MIRROR] Fixes flashlight eyes
|
2017-04-25 20:10:01 -05:00 |
|
LetterJay
|
2362b1ff46
|
Merge pull request #543 from Citadel-Station-13/upstream-merge-26456
[MIRROR] fixes people with no skin/golems dropping skin when gibbed
|
2017-04-25 20:07:26 -05:00 |
|
CitadelStationBot
|
607ab2b784
|
Fixes monkey transformation instantly killing a person
|
2017-04-25 15:45:27 -05:00 |
|
CitadelStationBot
|
fc0ff20e75
|
Dance Machine ~Fixes~
|
2017-04-25 15:14:54 -05:00 |
|
CitadelStationBot
|
a96ba5aae3
|
Removes a few spawns
|
2017-04-25 14:36:18 -05:00 |
|
CitadelStationBot
|
d8a3294686
|
Refactors T-Ray Scanners
|
2017-04-25 14:30:08 -05:00 |
|
CitadelStationBot
|
441efa81ca
|
Piggybacking on humans now takes a 1.5 second delay before you actually grab on
|
2017-04-25 13:47:26 -05:00 |
|
CitadelStationBot
|
5fde47917d
|
Examining a window gives tips for construction/deconstruction
|
2017-04-25 09:39:30 -05:00 |
|
CitadelStationBot
|
62348f9049
|
Fixes alien spit visual not disappearing
|
2017-04-25 09:36:23 -05:00 |
|
CitadelStationBot
|
fb61c31470
|
Small abductors refactor
|
2017-04-25 03:59:08 -05:00 |
|
CitadelStationBot
|
d931e5801c
|
A bunch of Initialize()s now have return values
|
2017-04-25 03:51:57 -05:00 |
|
CitadelStationBot
|
8e4c9f69d6
|
Fixes flashlight eyes
|
2017-04-25 03:50:52 -05:00 |
|
LetterJay
|
76ed57f90c
|
rej cleanup
|
2017-04-25 02:11:11 -05:00 |
|
LetterJay
|
9df952873b
|
Update type2type.dm
|
2017-04-25 01:55:12 -05:00 |
|
LetterJay
|
31e8bee39e
|
Update type2type.dm
|
2017-04-25 01:54:53 -05:00 |
|
LetterJay
|
3d51a07243
|
world fix
|
2017-04-25 01:52:49 -05:00 |
|
CitadelStationBot
|
607868a5de
|
[s]Exploit whack-a-mole
|
2017-04-25 01:31:50 -05:00 |
|
LetterJay
|
8088ce38cc
|
rej file cleanup
|
2017-04-25 01:15:04 -05:00 |
|
LetterJay
|
a06c6a2994
|
Merge pull request #508 from Citadel-Station-13/upstream-merge-26337
[MIRROR] Refactors picture frames to use wall frames system
|
2017-04-25 01:10:40 -05:00 |
|
LetterJay
|
e27c5c8db3
|
Merge pull request #545 from Citadel-Station-13/upstream-merge-26397
[MIRROR] Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker
|
2017-04-25 01:02:38 -05:00 |
|
LetterJay
|
cf0906597b
|
Merge pull request #551 from Citadel-Station-13/upstream-merge-26506
[MIRROR] >We still let old code in the codebase
|
2017-04-25 00:57:08 -05:00 |
|
LetterJay
|
de1d8188ae
|
removes rej files
|
2017-04-24 21:34:58 -05:00 |
|
LetterJay
|
88da83f504
|
Merge pull request #542 from Citadel-Station-13/upstream-merge-26416
[MIRROR] Ghosts no longer drift in space
|
2017-04-24 21:31:32 -05:00 |
|
LetterJay
|
f38f1e383b
|
Merge pull request #488 from Citadel-Station-13/upstream-merge-26344
[MIRROR] Fixes double warnings on new players connecting.
|
2017-04-24 21:27:40 -05:00 |
|
LetterJay
|
6070000c9a
|
Merge pull request #537 from Citadel-Station-13/upstream-merge-26485
[MIRROR] Renames "Hard Reset" to "Reboot World"
|
2017-04-24 21:23:31 -05:00 |
|
LetterJay
|
832233000e
|
Merge pull request #546 from Citadel-Station-13/upstream-merge-26479
[MIRROR] Getting uncuffed resets your clickdelay
|
2017-04-24 21:22:46 -05:00 |
|
LetterJay
|
176c11b8ea
|
Merge pull request #544 from Citadel-Station-13/upstream-merge-26457
[MIRROR] Doors crushing people makes a visible message
|
2017-04-24 21:22:12 -05:00 |
|