XDTM
988dbe87da
Brain Traumas
2017-12-06 12:05:20 -06:00
Dorsisdwarf
6dea43c709
Advanced Laserpointer Feline Interaction
2017-11-24 17:56:58 -06:00
LetterJay
eba36e48f9
Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188
...
[MIRROR] JSON feedback
2017-11-22 18:42:34 -06:00
deathride58
0f9a85e4d7
Merge pull request #3747 from Citadel-Station-13/upstream-merge-32101
...
[MIRROR] Refactor of catpeople mutant organs
2017-11-21 21:16:31 +00:00
deathride58
eeba86e27e
Merge branch 'master' into upstream-merge-32188
2017-11-18 05:31:42 +00:00
Jordie
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
vuonojenmustaturska
6ce69fb2c8
Replaces a bunch of mob loops with hopefully better ones
2017-11-16 16:09:15 -06:00
LetterJay
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
KorPhaeron
8f1d81f816
Dullahan Fixes ( #32358 )
...
* Dullahan
* Fixes cyborg issue
* Fixes hearing issues
2017-11-03 15:54:19 -05:00
ACCount
eb54055278
Refactor of catpeople mutant organs
2017-11-01 21:38:06 -05:00
Jordan Brown
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -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
Armhulen
49d5d08456
Adds a fireball from the heavens as an admin smite ( #31502 )
...
* really gamers?
* yeah yeah YEAH
* cucked again!
* it works
* I SAID IT WORKS
2017-10-12 20:37:58 -05:00
AnturK
5be4669924
Datum antag wizard.
2017-10-11 05:24:17 -05:00
oranges
bb9982e772
Merge pull request #31296 from ShizCalev/landmark-cleanup
...
Cleans up and fixes old landmarks
2017-10-05 03:05:40 -05:00
LetterJay
5ec781502c
Merge branch 'master' into upstream-merge-31116
2017-10-01 15:09:10 -04:00
LetterJay
49c63dd794
Update randomverbs.dm
2017-10-01 01:57:03 -05:00
LetterJay
747312cb6d
updates
2017-10-01 00:59:59 -05:00
AnturK
6afd603fe6
Fixes some hardset dna misuse
2017-09-30 14:51:52 -05:00
Jordan Brown
e5ef3d2405
Configuration datum refactor
2017-09-28 21:37:53 -05:00
Poojawa
f004c09346
seriously, 1,261 lines changed over 2?
2017-09-23 06:18:54 -05:00
Jordie
1030130672
Fixes create outfit Href issues
2017-09-23 05:32:36 -05:00
LetterJay
a960b63b0a
Merge branch 'master' into upstream-merge-30056
2017-09-13 06:08:59 -05:00
LetterJay
c2a41c9b51
commit
2017-09-13 06:04:22 -05:00
Jordan Brown
92b78d3298
[s] Adds a security token to all admin hrefs
2017-09-08 21:16:02 -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
3e0ead1204
Merge branch 'master' into upstream-merge-29105
2017-09-02 07:11:32 -05:00
LetterJay
7fea74994f
Update randomverbs.dm
2017-09-02 06:53:49 -05:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
CitadelStationBot
cdbaf5c4e8
Standardized CENTCOM spelling
2017-08-08 09:05:44 -05:00
CitadelStationBot
d4f15ff6da
[MIRROR] Beam Rifle Zooming Rework + Click catcher memes + bunch of other random stuff that players won't use ( #2039 )
...
* Beam Rifle Zooming Rework + Click catcher memes + bunch of other random stuff that players won't use
* Fixes beam rifle indent error
* Projectile target check hit code now uses a proc for resharing
* Update beam_rifle.dm
* Delete beam_rifle.dm.rej
* Changes clickcatcher to dynamically scale based on view range rather than making 1 tile for each tile viewed
* Update turf.dm
* Update turf.dm
* Delete click.dm.rej
* Update click.dm
* fxies
* woops
* Update turf.dm
* the actual rifle
* dumb clickcatcher
* actions
2017-08-03 06:12:27 -07:00
kevinz000
bbcad2fa58
Proper mirror PR for the disease refactor because I fucked up the first one. ( #2026 )
...
* Revert "im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025 )"
This reverts commit 44742cb115
2017-07-31 23:41:22 -07:00
CitadelStationBot
64966027e7
fixes hub not working ree ( #2112 )
2017-07-24 04:05:44 -07:00
kevinz000
44742cb115
im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" ( #2025 )
...
* Revert "Automatic changelog generation for PR #2021 [ci skip]"
This reverts commit 9d0cd37dd3#2021 )"
This reverts commit f2ac487927
2017-07-15 11:41:36 -07:00
CitadelStationBot
f2ac487927
Disease Refactor ( #2021 )
2017-07-15 11:40:49 -07:00
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
LetterJay
d04001c09d
another huge sync
2017-06-21 18:00:00 -05:00
CitadelStationBot
e8663bee81
Refactors the latejoin list
2017-06-04 15:08:35 -05:00
CitadelStationBot
13767b91ad
Fixes admiral recall ( #1374 )
2017-06-04 02:18:42 -07:00
CitadelStationBot
26448d7016
Removes the mess added with recalling with a message
2017-05-21 07:57:17 -05:00
CitadelStationBot
f624071766
[MIRROR] Ninja Refactor ( #1037 )
...
* Ninja Refactor
* Update antagonists.dm
* Delete antagonists.dm.rej
* Update antagonists.dm
* Update mind.dm
* Update mind.dm
* whatever, I fixed that cunt
2017-05-21 00:39:26 -05:00
CitadelStationBot
013101bd48
Fixes spelling on the EM Pulse action
2017-05-17 05:01:25 -05:00
LetterJay
52fa1f314f
Merge branch 'master' into upstream-merge-26760
2017-05-14 01:02:26 -04:00
LetterJay
e66cbfd7db
my v key is broken
2017-05-13 23:32:47 -05:00
LetterJay
36de555483
commit
2017-05-13 23:32:23 -05:00
CitadelStationBot
7baccb8b85
Removes vestigial list from minds.
2017-05-02 12:47:20 -05:00
LetterJay
4ecbec1406
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26720
2017-05-02 11:36:27 -05:00
LetterJay
a8e6de5795
manual merge
2017-05-02 05:06:13 -05:00
CitadelStationBot
7a4f1496e9
Changes a lot of ticker and ticker.mode checks to SSticker.hasRoundStarted
2017-05-01 07:24:45 -05:00
