Poojawa
8767fa299b
Fixes headpatting *wag and Vore spaceworthiness ( #2582 )
...
* no you're not supposed to die in a gut
* Re added tailwagging when patted
* adjust sounds, adding belly noises mode
* lowers sounds.
* Adds Noisy belly mode
2017-09-04 02:47:39 -05:00
CitadelStationBot
e353091c47
[MIRROR] Fixes shield blobs not blocking atmos ( #2575 )
...
* Fixes shield blobs not blocking atmos
* atmosia blocking
2017-09-04 02:47:09 -05:00
CitadelStationBot
2ab11de906
[MIRROR] Removes a Redundant Check ( #2572 )
...
* Removes a Redundant Check
* Removes redundant check
2017-09-04 02:41:41 -05:00
CitadelStationBot
ad43c951b8
[MIRROR] Slime people can eat anything again ( #2568 )
...
* Slime people can eat anything again
* slimes can eat. Furry food prefs
2017-09-04 02:41:15 -05:00
kevinz000
c00d7aa3f6
Update ears.dm ( #2489 )
2017-09-04 02:39:20 -05:00
CitadelStationBot
9b00f12ba0
Makes the shuttle code a little bit more robust by removing a snowflake loop ( #2559 )
2017-09-04 01:36:00 -05:00
CitadelStationBot
e7a6c2d09f
[MIRROR] Fixes anti-drop exploit ( #2589 )
...
* Fixes anti-drop exploit
* Update augments_internal.dm
2017-09-03 14:59:30 -07:00
LetterJay
e0eeda1f63
really fixes guilmons this time
2017-09-03 11:37:15 -05:00
LetterJay
9c857576b4
Merge pull request #2581 from Citadel-Station-13/ItemAddition
...
Everyone now spawns with pulserifles
2017-09-02 07:59:09 -05:00
LetterJay
f8413517bb
testing
2017-09-02 07:43:34 -05:00
LetterJay
7aa042cff1
Update randomverbs.dm
2017-09-02 07:33:45 -05:00
LetterJay
7711b73ca7
Update randomverbs.dm
2017-09-02 07:31:52 -05:00
LetterJay
a94ffca643
Update admin.dm
2017-09-02 07:28:33 -05:00
LetterJay
f4b08d32a7
Update admin.dm
2017-09-02 07:26:16 -05:00
LetterJay
3e0ead1204
Merge branch 'master' into upstream-merge-29105
2017-09-02 07:11:32 -05:00
LetterJay
2bfc7872fa
cleanup
2017-09-02 07:06:37 -05:00
LetterJay
fed956efec
Update job_exp.dm
2017-09-02 06:56:35 -05:00
LetterJay
74307f2858
Update preferences.dm
2017-09-02 06:55:52 -05:00
LetterJay
7fea74994f
Update randomverbs.dm
2017-09-02 06:53:49 -05:00
LetterJay
88b452595f
Update antag_spawner.dm
2017-09-02 06:52:03 -05:00
LetterJay
7617164617
Update blackbox.dm
2017-09-02 06:50:35 -05:00
LetterJay
4a1bb5addb
Update configuration.dm
2017-09-02 06:49:21 -05:00
LetterJay
78ed8f0913
Fixes mecha drill not working on windoors.
2017-09-02 05:35:36 -05:00
LetterJay
d8679dbfcf
Prevents hallucinations revealing people's identity
2017-09-02 05:33:55 -05:00
LetterJay
5d1c2c523b
Fixes no drop implant
2017-09-02 05:31:15 -05:00
LetterJay
e310435892
UI objects should PIXEL_SCALE
2017-09-02 05:26:22 -05:00
LetterJay
96c790a81f
Unruntimes fdel on savefiles
2017-09-02 05:23:35 -05:00
LetterJay
b1302230c0
Merge pull request #2560 from Citadel-Station-13/upstream-merge-30121
...
[MIRROR] Converts npc saves to jsons
2017-09-02 05:20:31 -05:00
LetterJay
fafc1b2d14
Merge pull request #965 from Citadel-Station-13/custom_roundstart_items
...
Custom Roundstart Items
2017-09-01 11:41:12 -05:00
LetterJay
98da910178
Update read_from_file.dm
2017-09-01 11:21:50 -05:00
LetterJay
a6aa71e0b9
commit
2017-09-01 09:52:29 -05:00
kevinz000
e8bb79d7c9
kk
2017-09-01 07:12:08 -07:00
kevinz000
ddb49cd1ca
kek
2017-09-01 06:58:31 -07:00
kevinz000
b193d77c1c
hm
2017-09-01 03:36:18 -07:00
LetterJay
4a9b59cba1
Merge pull request #2576 from Citadel-Station-13/upstream-merge-30292
...
[MIRROR] Rearranges the antagonist panel: now with 150 more hours of testing
2017-08-31 22:25:43 -05:00
LetterJay
98dcb56a27
Merge pull request #2569 from Citadel-Station-13/upstream-merge-30266
...
[MIRROR] Chasms will alert mobs below them when they form
2017-08-31 22:24:55 -05:00
kevinz000
41318e715c
Merge branch 'master' into custom_roundstart_items
2017-08-31 18:23:56 -07:00
Jordan Brown
528b7a86b8
Merge pull request #30292 from Xhuis/revert-30289-RevertAntag
...
Rearranges the antagonist panel: now with 150 more hours of testing
2017-08-31 14:39:42 -05:00
CitadelStationBot
9e90d582e5
Fixes dummy unequip runtimes.
2017-08-31 08:39:56 -05:00
CitadelStationBot
e70b6ceb33
Chasms will alert mobs below them when they form
2017-08-30 17:06:38 -05:00
CitadelStationBot
c2a792d577
Converts npc saves to jsons
2017-08-30 08:01:36 -05:00
kevinz000
93647d77ad
[DNM] Fixes the codebase ( #2556 )
...
* fixes stuff
* goddamnit flags
2017-08-30 00:08:40 -07:00
kevinz000
28ea6f3ad2
Merge pull request #2499
2017-08-29 22:43:54 -07:00
kevinz000
874bad1203
Merge pull request #2524
2017-08-29 22:40:05 -07:00
kevinz000
cf93e511ce
Merge pull request #2527
2017-08-29 22:40:02 -07:00
kevinz000
bd8a9dc435
Merge pull request #2528
2017-08-29 22:40:00 -07:00
kevinz000
17142cc247
Merge pull request #2530
2017-08-29 22:39:57 -07:00
kevinz000
f70fd6a980
Merge pull request #2536
2017-08-29 22:39:54 -07:00
kevinz000
039aea1724
Merge pull request #2541
2017-08-29 22:39:48 -07:00
kevinz000
967d0c5dee
Merge pull request #2542
2017-08-29 22:39:45 -07:00