LetterJay
ac5503d338
Merge branch 'master' into upstream-merge-33055
2017-12-25 04:10:34 -06:00
LetterJay
92c347d068
Merge branch 'master' into upstream-merge-33246
2017-12-20 00:27:06 -06:00
LetterJay
408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
LetterJay
cfeea088e8
Update genetic.dm
2017-12-18 17:27:12 -06:00
XDTM
3af0aa2489
[Ready Again]Refactors disabilities into lists, allowing for independent disability sources
2017-12-18 15:19:53 -06:00
Emmett Gaines
f875d4e176
Defines math, take 2
2017-12-17 10:02:43 -06:00
Armhulen
8a0aa32335
Mi-go
2017-12-17 04:11:01 -06:00
LetterJay
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
AnturK
6bfca33a78
Roundend report refactor
2017-12-11 10:58:23 -06:00
XDTM
988dbe87da
Brain Traumas
2017-12-06 12:05:20 -06:00
ShizCalev
2762e3b530
Fixes Lord Singuloth hungering for more than he should
2017-11-24 13:00:42 -06:00
jammer312
cf10130b21
Conjuration spells fix ( #32951 )
...
* conjure spells fix
* added newline at end of file
2017-11-21 22:30:05 -06:00
LetterJay
809951c56c
Merge pull request #3326 from Citadel-Station-13/upstream-merge-31176
...
[MIRROR] loc -- > forcemove
2017-11-14 15:58:20 -06:00
Leo
6962cf8b24
Merge pull request #32577 from PKPenguin321/patch-13
...
Fixes lich revival text spelling
2017-11-11 14:32:04 -06:00
LetterJay
d6e5942baf
Merge branch 'master' into upstream-merge-31176
2017-11-09 03:24:38 -06:00
LetterJay
110b0e0615
Update shapeshift.dm
2017-11-04 22:44:56 -05:00
AnturK
b32f8dbba7
Shapeshift tweaks.
2017-11-03 15:54:28 -05:00
KorPhaeron
edfc86c895
Halloween race fixes
2017-10-29 12:31:38 -05:00
Armhulen
404740d784
Adds spiders to the shapeshift menu! ( #31896 )
...
* >gondolas
* :(
2017-10-22 13:55:07 -05:00
CitadelStationBot
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
CitadelStationBot
adc2e46114
[MIRROR] Does some code standardization/consistency. ( #3161 )
...
* Does some code standardization/consistency.
* fixes merge conflict generation
* Missed a few, oops
* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
LetterJay
568ed91f28
Merge pull request #3430 from Citadel-Station-13/upstream-merge-30599
...
[MIRROR] Moves projectile processing to a subsystem
2017-10-16 10:39:41 -04:00
kevinz000
ed96224d3a
Moves projectile processing to a subsystem
2017-10-15 21:51:24 -05:00
MoreRobustThanYou
1b7cd05752
EI NATH! now causes a flash of light ( #31691 )
...
i've been reading too much harry potter
2017-10-15 21:04:14 -05:00
kevinz000
b20e5916ea
Removes a bunch of sleeps/spawns and makes a few booleans defines
2017-10-14 18:53:48 -05:00
kevinz000
033d14e8b3
loc -- > forcemove
2017-10-12 06:13:11 -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
