kevinz000
ec2993289e
sync
2017-08-29 20:07:36 -07:00
kevinz000
76e05ad88e
Merge branch 'master' into upstream-merge-30203
2017-08-29 20:05:42 -07:00
kevinz000
4848a1fbf1
Merge branch 'master' into upstream-merge-30259
2017-08-29 20:05:25 -07:00
kevinz000
1b0bbb8c86
Merge branch 'master' into upstream-merge-30113
2017-08-29 20:02:14 -07:00
kevinz000
3f16272717
line endings ree
2017-08-29 19:57:58 -07:00
kevinz000
8d0c29f9da
ok
2017-08-29 19:56:27 -07:00
LetterJay
0970653382
adds missing var preventing guilmon bodymarkings from being displayed
2017-08-29 21:26:50 -05:00
LetterJay
b2114a7b81
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2017-08-29 21:19:22 -05:00
CitadelStationBot
3e1031d6b9
Adds a ghost verb to see all available ghost spawners
2017-08-29 17:45:50 -05:00
CitadelStationBot
1caba77431
Server tools versioning and fix to displayed testmerges
2017-08-29 17:16:17 -05:00
CitadelStationBot
605963d45c
AltClick Improvements
2017-08-29 17:15:12 -05:00
CitadelStationBot
9c63ab2d39
Shadow Walk/New Shadowling movement spell
2017-08-29 17:14:07 -05:00
CitadelStationBot
719717934c
Makes the singularity eat asteroids, adds a planetary z-level list with a helper that adds maps to it
2017-08-29 17:10:59 -05:00
kevinz000
f344c5edf2
Merge branch 'master' into upstream-merge-30084
2017-08-29 10:09:13 -07:00
kevinz000
f45f5bbf3d
quadruple wew
2017-08-29 10:02:18 -07:00
kevinz000
5f5065eb46
kek
2017-08-29 09:59:57 -07:00
kevinz000
ca5462adce
triple wew
2017-08-29 09:55:02 -07:00
kevinz000
5591afc9ce
double wew
2017-08-29 09:53:11 -07:00
kevinz000
301a581e64
sync
2017-08-29 09:41:11 -07:00
kevinz000
064ade469f
sync
2017-08-29 09:35:55 -07:00
kevinz000
88093698f2
sync
2017-08-29 09:33:37 -07:00
kevinz000
80221fa874
sync
2017-08-29 09:32:40 -07:00
kevinz000
498bd61928
sync
2017-08-29 09:12:56 -07:00
CitadelStationBot
3fe08c3cc7
Prevents medbeams from crossing themselves
2017-08-29 09:50:47 -05:00
CitadelStationBot
2ff65a8e39
[MIRROR] Lowers the chance for monkeys to become gorillas ( #2476 )
...
* Lowers the chance for monkeys to become gorillas
* Delete life.dm.rej
* Update life.dm
2017-08-29 00:59:34 -07:00
LetterJay
97bee315bf
Update living_defense.dm
2017-08-29 01:50:46 -05:00
LetterJay
6c76ae2395
clean up
2017-08-28 10:34:31 -05:00
LetterJay
7ea6eeb64e
GUHRILLAZ
2017-08-28 10:23:11 -05:00
LetterJay
defab9c7fc
Merge branch 'master' into upstream-merge-29923
2017-08-28 09:19:44 -05:00
LetterJay
739d5c70a7
Update meat.dm
2017-08-28 09:17:14 -05:00
LetterJay
27750d91d6
Merge pull request #2529 from Citadel-Station-13/upstream-merge-30214
...
[MIRROR] Removes the suppose-to-be unused shuttle wall path
2017-08-28 09:01:47 -05:00
LetterJay
792c509827
Merge pull request #2526 from Citadel-Station-13/upstream-merge-30200
...
[MIRROR] Fixes survival_pods being a valid_territory for gangs sprays & dominations/blob takeovers/cult summons/ect
2017-08-28 09:01:06 -05:00
LetterJay
b3c70bf024
Merge pull request #2525 from Citadel-Station-13/upstream-merge-30204
...
[MIRROR] Fixes APC pixel shift being off
2017-08-28 09:00:46 -05:00
LetterJay
db56781717
Merge pull request #2522 from Citadel-Station-13/upstream-merge-30222
...
[MIRROR] Fixes surplus log icons.
2017-08-28 08:58:06 -05:00
LetterJay
03a26e6468
Merge pull request #2518 from Citadel-Station-13/kevinz000-patch-5
...
absolute pathing for mammals
2017-08-28 08:56:55 -05:00
LetterJay
29de038837
Merge pull request #2498 from Citadel-Station-13/upstream-merge-30162
...
[MIRROR] Gives plasmamen hallucinations when taking blackpowder
2017-08-28 08:54:01 -05:00
LetterJay
c043b8a1d5
Merge pull request #2495 from Citadel-Station-13/upstream-merge-30182
...
[MIRROR] Holoparasite prompts now have a "Never For This Round" option
2017-08-28 08:46:19 -05:00
LetterJay
7474aa3edb
Merge pull request #2492 from Citadel-Station-13/upstream-merge-30191
...
[MIRROR] Fixes empty adminhelp tickets messages
2017-08-28 08:45:49 -05:00
LetterJay
5225aa7d65
Merge pull request #2493 from Citadel-Station-13/upstream-merge-30192
...
[MIRROR] Adds volume control to admin-played sounds
2017-08-28 08:45:34 -05:00
CitadelStationBot
2a0f617f68
Adds more round id tracking
2017-08-28 05:50:05 -05:00
CitadelStationBot
12ff0e7406
Removes the suppose-to-be unused shuttle wall path
2017-08-28 02:20:45 -05:00
CitadelStationBot
bab6b30e02
Splits jungle mob code into separate files
2017-08-28 02:20:39 -05:00
CitadelStationBot
2d4bd6f6f0
Fixes survival_pods being a valid_territory for gangs sprays & dominations/blob takeovers/cult summons/ect
2017-08-28 02:20:30 -05:00
CitadelStationBot
4a456fd2c7
Fixes APC pixel shift being off
2017-08-28 02:20:25 -05:00
CitadelStationBot
0b1c36c938
Changes playtime verb name
2017-08-28 02:20:21 -05:00
CitadelStationBot
993b452729
Fixes surplus log icons.
2017-08-28 02:20:11 -05:00
kevinz000
5ebf1c4b6b
Update furrypeople.dm
2017-08-27 19:48:29 -07:00
CitadelStationBot
349bd03b73
Adds periods to larva roars ( #2512 )
2017-08-27 06:42:16 -07:00
CitadelStationBot
94429bdccc
Cleaned up environment_smash vars with bitflag defines ( #2515 )
2017-08-27 05:55:07 -07:00
ktccd
985ea0d768
Sets all food prefs to NONE ( #2517 )
...
People can RP their food likes/dislikes. This stuff, like deciding what
is/isn't edible to slimes and such is unasked for and unecessary.
Also, they didn't address that this stealth-nerfs non-humans as
donk-pockets and such food items were put in a lot of places, expecting
to be used for healing, but can now not be eaten by, for example,
lizards.
2017-08-27 05:54:48 -07:00
