kevinz000
b20e5916ea
Removes a bunch of sleeps/spawns and makes a few booleans defines
2017-10-14 18:53:48 -05:00
LetterJay
7390bd82fd
Update rightandwrong.dm
2017-10-12 02:55:28 -05:00
AnturK
5be4669924
Datum antag wizard.
2017-10-11 05:24:17 -05:00
Jordan Brown
7b30be0058
Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war
...
In which the stoner one gets stoned and tries to address tick contention... again
2017-10-10 13:28:38 -05:00
Jordan Brown
075cb673c0
Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-07 12:37:06 -05:00
KorPhaeron
037ea0ce13
Nightmare organs
2017-10-03 18:22:01 -05:00
CitadelStationBot
1e309deac0
[MIRROR] Wizard can't cast shout or whisper spells when he is unable to speak ( #2965 )
...
* Wizard being mute now blocks touch attacks from activating (can still be cast)
* Wizard can't cast shout or whisper spells when he is unable to speak
2017-10-02 23:20:46 -07:00
AnturK
6afd603fe6
Fixes some hardset dna misuse
2017-09-30 14:51:52 -05:00
XDTM
9b5a2f7490
Adds action buttons for spiders, refactors action code, nurse spiders can set a hereditary directive for their children to follow
2017-09-28 16:02:31 -05:00
CitadelStationBot
6efb76fad5
[MIRROR] Ammo cleanup ( #2643 )
...
* Ammo cleanup
* Update briefcase.dm
* Update manned_turret.dm
* Update mime.dm
* Update manned_turret.dm
* Update manned_turret.dm
* fixes
* mime memes
2017-09-22 22:30:44 -05:00
LetterJay
c0a467c2fc
Merge pull request #2709 from Citadel-Station-13/upstream-merge-30415
...
[MIRROR] Nightmare
2017-09-12 23:31:38 -05:00
KorPhaeron
4d2fe460ed
Nightmare
2017-09-11 16:23:47 -05:00
kingofkosmos
63122795f9
Adds missing span-endings
2017-09-11 07:10:09 -05:00
LetterJay
8299cf576c
this sure was FUN
2017-09-07 09:47:56 -05:00
kevinz000
76e05ad88e
Merge branch 'master' into upstream-merge-30203
2017-08-29 20:05:42 -07:00
CitadelStationBot
9c63ab2d39
Shadow Walk/New Shadowling movement spell
2017-08-29 17:14:07 -05:00
LetterJay
6c76ae2395
clean up
2017-08-28 10:34:31 -05:00
kevinz000
3254fcf535
goddamnit_again ( #2511 )
2017-08-26 18:43:57 -07:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -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
b01a24c95b
my eyes hurt
2017-08-22 01:42:20 -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
cc7ad81f79
Adds helpers to avoid << use
2017-08-08 22:28:16 -05:00
CitadelStationBot
1b22c5fe0c
[MIRROR] Separates actions.dmi into multiple files ( #2214 )
...
* Separates actions.dmi into multiple files
* Delete beam_rifle.dm.rej
* Delete action.dm.rej
2017-08-03 06:09:39 -07:00
CitadelStationBot
55f1de10a6
Spellchecking
2017-08-01 08:46:20 -05:00
LetterJay
35fba1933e
Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304
...
[MIRROR] Made some object lists less terrible to read
2017-07-31 03:43:03 -05:00
CitadelStationBot
b998e14a5b
Map Spellcheck
2017-07-24 21:16:46 -05:00
CitadelStationBot
a72962c300
Made some object lists less terrible to read
2017-07-18 09:44:43 -05:00
CitadelStationBot
1da785ffb5
Removes old height parameter from CanPass proc
2017-07-13 17:46:36 -05:00
CitadelStationBot
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
CitadelStationBot
1b70c06474
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs ( #1970 )
2017-07-10 16:10:42 -07:00
CitadelStationBot
beccb4742f
Replaces all instances of spawn() with addtimer/INVOKE_ASYNC
2017-07-06 09:14:03 -05:00
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
793a2ce28f
Grammar and message tweaks ( #1722 )
2017-07-01 21:22:29 -07:00
LetterJay
c760c52817
upstream-merge-27951
2017-06-11 02:11:34 -05:00
CitadelStationBot
9725329268
A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals)
2017-06-07 03:06:15 -05:00
CitadelStationBot
11344c4682
Refactors explosions
2017-05-24 16:45:00 -05:00
LetterJay
34e74a377e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27442
2017-05-24 08:06:53 -05:00
CitadelStationBot
4533d31e34
Cult Fixes for Construct Icons and Spells
2017-05-22 10:49:33 -05:00
Poojawa
45ba084c6a
Merge branch 'master' into upstream-merge-27344
2017-05-20 23:26:28 -05:00
CitadelStationBot
45bc120501
fixes aimed spells not recharging
2017-05-19 06:21:06 -05:00
CitadelStationBot
a430e24555
Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual
2017-05-18 16:38:09 -05:00
Poojawa
0419ef823b
spells recharge fix. #976
2017-05-18 11:49:46 -05:00
Poojawa
2f0881c0b6
spells recharge fix. #976
2017-05-18 11:48:38 -05:00
CitadelStationBot
c6a671a11b
[MIRROR] Devil refactor+small revamp ( #887 )
...
* Devil refactor+small revamp
* Delete mind.dm.rej
* clean up rej
* Delete admin_investigate.dm.rej
* Delete mapping.dm.rej
* compile fix
2017-05-18 09:06:01 -05:00
CitadelStationBot
6617f68604
[MIRROR] Harvesters are more fun to play ( #894 )
...
* Harvesters are more fun to play
* resolve .rej
2017-05-18 07:12:29 -05:00
CitadelStationBot
eb359f1014
[MIRROR] Cerestation Tweaks VI: Shuttle Edition ( #876 )
...
* Cerestation Tweaks VI: Shuttle Edition
* fix .rej
2017-05-18 06:51:26 -05:00
CitadelStationBot
257cf986c5
Repaths C4 ( #808 )
...
* Repaths C4
* Delete tgstation.2.1.3.dmm.rej
* Add files via upload
* update CitadelStation-1.2.1.dmm
2017-05-18 00:37:20 -05:00
Poojawa
3dbbdc4476
Cryo icon state and Wizard tweaks ( #975 )
...
* tweaks
* typing habits are bad.
* Update spellbook.dm
* Update rod_form.dm
2017-05-17 23:36:50 -05:00
