2d599e1b97
Adds the circle game ( #28961 )
...
* adds the circle game
- adds an inventory sprite to weapons.dmi
- adds the code for the hand "object" to weaponry.dm
- adds emote datum code for making your hand a circle to emote.dm
* fixes
- makes sure the emote is actually ran before creating objects
- qdels the new object if it fails to get placed into the mobs hand
* adds a message to the user when emote fails
* added special examine reactions
- added new proc to items.dm
- added handling for the proc in human/examine.dm
- added special examine reaction to the circled hand in weaponry.dm
- removed a check on the circle emote that made it not work in emote.dm
* defines, a fix
* undoes last two commits
2017-07-04 22:25:51 -04:00
66824868ce
Merge pull request #29017 from Xhuis/voice_of_god_role_checks
...
Fixes the Voice of God singling out roleless creatures
2017-07-04 21:50:52 -04:00
d6b66911b1
Merge pull request #29020 from ohnopigeons/autocharterfixpr
...
[s] Fixes for charter autoaccept
2017-07-04 21:49:36 -04:00
5f6090f7b3
Merge pull request #29015 from Xhuis/deconvert_messages
...
Unconscious Servants are now properly informed when they're deconverted
2017-07-04 18:13:45 -04:00
b04ecfa6a2
hup
2017-07-04 15:42:22 -04:00
70dcd2ea9b
Clockcult conversion has more explicit logging in what did it ( #29007 )
...
* Clockcult conversion has more explicit logging in what did it
* clang
* tweak
2017-07-04 15:40:45 -04:00
3352767796
Fixes the legion door admin report/logging
2017-07-04 15:29:59 -04:00
c7aa8c1f32
Fixes infinite heartbeat sounds
2017-07-04 13:46:48 -04:00
4889de7d9d
Removes the hot variants of necropolis tiles and walls
2017-07-04 13:36:59 -04:00
fca41fd2ee
we don't talk about that
2017-07-04 12:34:34 -04:00
b0e30ba089
Tweaks the blood-drunk miner
2017-07-04 12:32:10 -04:00
334df25e69
show them messages
2017-07-04 11:03:34 -04:00
de1281f458
Fixes PDA runtime href exploit ( #28959 )
2017-07-04 10:31:52 -03:00
6a1f8d1815
Fixes Ripley speed change
...
The slow/fast speeds were reversed.
2017-07-04 07:12:42 -05:00
9d12a4c700
Small boost to get_pixel_turf()
...
Curse you MSO! you slowed it doooooown.
2017-07-04 13:02:36 +01:00
d23c6f910d
Checks for temporary martial arts on mind transfer ( #28746 )
...
* Checks for temporary martial arts on mind transfer
* Makes transferring its own proc
* Makes sure martial arts are qdeleted on removal
* Improves teaching and removing
2017-07-04 11:34:05 +02:00
0aa489f2b4
Uses ignored_mob
2017-07-03 20:53:17 -04:00
d5159f0e35
Fixes for charter autoaccept
2017-07-03 20:52:34 -04:00
a9f94cf44c
Gives role checks to the Voice of God
2017-07-03 18:58:23 -04:00
ff24b40b0c
Decon messages are now visible to unconscious cultists
2017-07-03 18:30:07 -04:00
a2b21ab93d
Fixes pods not counting as escape ( #28988 )
2017-07-03 19:13:34 -03:00
6a5bb83d98
Makes cookie alert private ( #29012 )
2017-07-03 19:12:51 -03:00
4a80a8fbe6
Rewrites Recollection and splits it into categories, rewords Hierophant Network description ( #28711 )
...
* Rewrites Recollection
* Conflicts 1
* Typos and stuff!
* Capitalizes more stuff
* capitalizations, rewords, oh my
* Conflicts 1
* Conflicts 3 (and space!)
* More changes
2017-07-03 11:09:47 -04:00
8ad0737cf5
Forced two-handed objects can now be stored
2017-07-03 11:01:43 -04:00
9a5a2a35aa
Merge pull request #28966 from ChangelingRain/minerruins
...
Actually adds the blood-drunk miner ruins
2017-07-02 22:57:57 -04:00
407e0e77e4
Ruin placement will try very hard to place any ruins with negative costs before attempting any other ruins ( #28973 )
...
* Ruin placement will try very hard to place all 0-cost ruins before placing any ruins with actual costs
* comment
* account for ruin variants properly please
* cost has a cost of 5
* tweak
2017-07-02 22:57:32 -04:00
888b2e093e
Makes the lavaland pressure check a proc ( #28954 )
...
* Makes the lavaland pressure check a proc
* code that probably did nothing tm
* sss
* 50 should be a define instead
2017-07-02 20:14:42 -04:00
e116ceec10
Merge pull request #28974 from JamieH/patch-1
...
Remove sanitize_ooccolor
2017-07-02 20:10:22 -04:00
f29a038d71
DNA syringe gun damage down to 'sane' from revolver ( #28975 )
...
* Fixes a bug
* This didnt do what I thought it did
2017-07-02 19:02:04 -03:00
f5d800a06d
Merge branch 'master' of https://github.com/tgstation/tgstation into gero_gero
...
# Conflicts:
# icons/effects/96x96.dmi
2017-07-01 16:20:05 -07:00
bf72887e38
Merge pull request #28903 from Cyberboss/swarmerfix
...
Swarmer cleanup
2017-07-01 18:14:54 -03:00
685dba0f5a
Merge pull request #28930 from Cyberboss/cardboardtubes
...
Fixes cardboard tube duping
2017-07-01 18:14:13 -03:00
19abbab8cd
Merge pull request #28962 from Xhuis/gun_reskin_fix
...
Fixes reskinned guns being invisible
2017-07-01 18:13:20 -03:00
8280b63985
Fixes deathgasping while being cloned ( #28949 )
2017-07-01 18:11:53 -03:00
5b66f2f1b2
Speeds up SSoverlays ( #28933 )
2017-07-01 15:55:11 -03:00
2eaef38534
Remove sanitize_ooccolor
2017-07-01 17:07:04 +01:00
98508c9236
Merge pull request #28946 from lzimann/holo
...
Changes the holodeck to use tgui, plus some code refactor/improvements
2017-07-01 11:56:57 -04:00
f6ad5996f3
Rethemes the ash walker nest to match the Necropolis ( #28886 )
...
* Rethemes the Necropolis
* clen
* not clever enough, hmm...
* that's a bug. hello, bug.
* no message
* a terrifying Legion room. full of one (1) Legion.
* some tweaks, inside has actual floor type
* tweaks
* Rethemes the ash walker nest to match the necropolis
* fix some issues with the door version
* whoops
* run mapmerge tgm, does not tgm
* whoops
* whoops, all dirs
* tgm
* The bonfire has a grill
* nah just do what ergo wanted
2017-07-01 11:39:31 -03:00
53cbfc20b3
Chasms, asteroid turfs, basalt, and lava can no longer be made wet ( #28951 )
2017-07-01 11:38:17 -03:00
1a118c0651
Merge branch 'master' of https://github.com/tgstation/tgstation into gero_gero
...
# Conflicts:
# icons/effects/96x96.dmi
2017-06-30 21:31:32 -07:00
c51ac78421
More leaper stuff
2017-06-30 21:16:44 -07:00
5ab0992bbb
slightly more huntery
2017-06-30 23:24:01 -04:00
be746c1946
Actually adds the blood-drunk miner ruins
2017-06-30 23:20:16 -04:00
a110e881ad
Adds the blood-drunk miner as a potential mining "mini" boss ( #28829 )
2017-06-30 22:39:49 -03:00
5c5c7b7470
Adds a small recovery window to variable length megafauna attacks for more predictable melee resolution ( #28730 )
2017-06-30 22:38:30 -03:00
fdce8da565
Changes the holodeck to use tgui, plus some code refactor/improvements
2017-06-30 21:27:55 -03:00
4ab451e6ab
More leaper fixes
2017-06-30 17:23:29 -07:00
044fa0ea45
Cleans up godclash code ( #28939 )
...
* Cleans up clash code, adds sound_to_playing_players
* Removes some debug code
* z-level check
* Removes an old thing
* Cyberboss changes
* changes @ maintainer request
2017-06-30 20:03:40 -04:00
24de3629fb
Merge pull request #28941 from optimumtact/bananaphone
...
use_power var now uses a define to reflect it not being a bool
2017-06-30 19:28:30 -04:00
a0e6b52a5c
Port can opening from /vg/ ( #28936 )
...
* Create drinks.dm
* Update drinks.dm
* Delete drinks.dm
* Update drinks.dm
* PORT SOUNDS FROM /vg/
* POP!
* nope
* Update drinks.dm
* Update drinks.dm
* why was attack_self there twice?
* Update drinks.dm
* Update drinks.dm
* GLOB GLOB GLOB
* Update sound.dm
* Update drinks.dm
* Update drinks.dm
* Update drinks.dm
* Update drinks.dm
* Lid is NOT soda specific, right?
2017-06-30 17:19:11 -04:00
PKPenguin321
Jordan Brown
Joan Lung
Xhuis
kevinz000
GunHog
Remie Richards
Really-Good-Soda-Flavor
Pigeons
AnturK
Shadowlight213
Supermichael777
Ergovisavi
Leo
MoreRobustThanYou
JamieH