LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
CitadelStationBot
3ea2288820
Fixes sounds for toy nuke, red button, and talking action figures ( #2475 )
2017-08-24 18:31:24 -07:00
CitadelStationBot
d5dfe45c1e
Dummies no longer queue, which humans probably shouldn't do ever ( #2477 )
2017-08-24 18:30:51 -07:00
CitadelStationBot
7a4df41221
Remove some unused goonchat stuff ( #2481 )
2017-08-24 18:29:50 -07:00
CitadelStationBot
47596fadfc
Makes boss tiles immune to the oldest boss, Lord Singuloth ( #2465 )
2017-08-24 18:27:29 -07:00
CitadelStationBot
a6d64204ad
[MIRROR] Updates PubbyStation ( #2325 )
...
no
2017-08-22 18:20:46 -07:00
kevinz000
35b7b93b24
ok this is going to be a pain in the ass ain't it ( #2458 )
...
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996
Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" ( #2457 )
...
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
LetterJay
15b378ddf4
adminrank hotfix
2017-08-22 03:51:21 -05:00
LetterJay
2954e8ad16
Merge pull request #2455 from Citadel-Station-13/kevinz000-patch-4
...
Makes beepsky stop bullying 2hus
2017-08-22 02:29:13 -05:00
LetterJay
b01a24c95b
my eyes hurt
2017-08-22 01:42:20 -05:00
kevinz000
d56cc32cf0
Update human.dm
2017-08-21 21:43:17 -07:00
kevinz000
4316a5a61b
Update human.dm
2017-08-21 21:41:59 -07:00
LetterJay
a0cf777040
Merge branch 'master' into upstream-merge-29940
2017-08-21 23:29:24 -05:00
CitadelStationBot
b5e7f7f7fe
[MIRROR] Adds defines for mouse_opacity ( #2381 )
...
* Adds defines for mouse_opacity
* Delete misc.dm.rej
* Update misc.dm
2017-08-21 20:29:37 -07:00
kevinz000
61e6f2815b
Update stomach.dm ( #2453 )
2017-08-21 20:27:21 -07:00
CitadelStationBot
e6650e6f35
Refined Test Areas (Station Z) debug output ( #2321 )
2017-08-21 20:25:20 -07:00
CitadelStationBot
b72d304f1c
[MIRROR] Fixes the amounts for examining disgusted people ( #2253 )
...
* Fixes the amounts for examining disgusted people
* Update examine.dm
* Delete examine.dm.rej
2017-08-21 20:24:29 -07:00
CitadelStationBot
4961966552
|SPECIES FOOD PREFERENCES| ( #2232 )
...
* Species food preferences
* sync
* Update humans.dm
* FUCK PUBBY
2017-08-21 20:23:30 -07:00
CitadelStationBot
999c921f63
Removes the chat message from *spin ( #2428 )
2017-08-21 19:54:24 -07:00
LetterJay
f2f1474123
Merge pull request #2322 from Citadel-Station-13/upstream-merge-29747
...
[MIRROR] Removes a great amount of machinery copypasta with circuitboards.
2017-08-21 20:32:10 -05:00
Poojawa
91fc414b20
Changes Ghost role ping sound effects ( #2441 )
...
* change that fucking blare
* Update xenobiology.dm
2017-08-21 17:05:09 -07:00
ktccd
597c048975
This was bothering me ( #2449 )
...
Now it's fixed.
2017-08-21 17:03:41 -07:00
ktccd
987c0c35da
Makes Taurs not render human legs ( #2448 )
...
Since taurs use their own sprite legs instead, we'll rely on those.
This'll fix some fringe cases with nagas and the problem with driders
completely covering their front drider legs.
This will introduce some weirdness with cutting off limbs, since taur
sprites have NO support for this, but I would need to completely
refactor how we handle taurs to split up their sprites like that... And
I'm not THAT good.
2017-08-21 17:03:29 -07:00
LetterJay
ae9e4495f9
Merge branch 'master' into upstream-merge-29747
2017-08-20 09:53:17 -05:00
CitadelStationBot
da6e3d7c8e
readds toggle_hear_radio admin verb
2017-08-19 06:45:50 -05:00
CitadelStationBot
f7bde6a76a
Makes mixing meth dangerous again
2017-08-18 18:59:58 -05:00
Cactus
ad8af9f9ec
fixes shark tail color
...
husky ears moved to extra instead of inner, in line with wolf ears
2017-08-18 17:27:07 -04:00
Cactus
61d7ad4e82
Stylesheet and Wolves ( #2389 )
...
* organizes the mam_bodyparts file by species
* Revert "organizes the mam_bodyparts file by species"
This reverts commit ab692973ba20c282becf0d69514b1ac03d5447f8.
* stylesheet fix
* wolf sprite edits
* conflict resolution
* wolf accessories readded
2017-08-18 15:35:08 -04:00
LetterJay
6dd7c44bbc
Merge pull request #2361 from Citadel-Station-13/upstream-merge-29829
...
[MIRROR] Merges the two turf/Entereds
2017-08-18 13:41:23 -05:00
LetterJay
f378f66705
Merge pull request #2347 from Citadel-Station-13/upstream-merge-29794
...
[MIRROR] Removes chat pings from href logs
2017-08-18 11:27:13 -05:00
LetterJay
094c4847f7
Merge pull request #2355 from Citadel-Station-13/upstream-merge-29849
...
[MIRROR] More baseturf helpers
2017-08-18 11:26:53 -05:00
LetterJay
79c44b053d
Merge branch 'master' into upstream-merge-29794
2017-08-18 11:14:45 -05:00
CitadelStationBot
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
CitadelStationBot
2a2e4b2af4
Improves attack logging of pulling / grabbing / throwing
2017-08-17 09:19:05 -05:00
CitadelStationBot
68830dac71
Changes smes, cells, cell charger, terminals and apcs icons
2017-08-16 20:02:24 -05:00
LetterJay
60f4d552da
Merge pull request #2398 from Citadel-Station-13/upstream-merge-29912
...
[MIRROR] Removes meth explosion syringes
2017-08-16 19:34:51 -05:00
CitadelStationBot
9176bbc129
Removes meth explosion syringes
2017-08-16 17:59:48 -05:00
CitadelStationBot
e5b7eefffe
Nerfs L6 SAW Hollow Point Bullets from -10 armour penetration to -60 armour penetration.
2017-08-16 17:53:39 -05:00
LetterJay
2b9f59ca3d
bonesless pizza
2017-08-16 15:06:16 -05:00
LetterJay
c627cec04a
Merge pull request #2388 from sirelgate/master
...
Xeno Fix, Nerfing them.
2017-08-16 13:51:06 -05:00
Haresay
6f20e222d3
xenofix
2017-08-16 11:55:40 -06:00
Haresay
aaaecf731c
xenonerfs
2017-08-16 11:35:36 -06:00
Haresay
e06288d41a
Xenonerfs
2017-08-16 10:31:03 -06:00
LetterJay
b3e984af5b
Update furrypeople.dm
2017-08-16 09:41:55 -05:00
LetterJay
95cfe5baa0
Update browserOutput.dm
2017-08-15 19:48:26 -05:00
LetterJay
0ffaf66d1f
Merge branch 'master' into upstream-merge-29690
2017-08-15 19:18:22 -05:00
LetterJay
d133510288
Update preferences_savefile.dm
2017-08-15 19:06:41 -05:00
LetterJay
ab27b63cf9
Merge branch 'master' into upstream-merge-29611
2017-08-15 18:55:12 -05:00
Haresay
67cd217681
bumped heat damage after calculating armor
2017-08-15 10:19:38 -06:00
