Poojawa
5518efebea
everything but mob stuff
2018-04-23 01:06:17 -05:00
Poojawa
5fa001c10f
things with stuff ( #6233 )
...
* buncha things from upstream
* datums globals, onclick
* datums
* game folder, holy shit mirror bot why
* modules
* icons
* dme
* compiles cleanly
* tools purge
* updates maps
* double check just because. and wew lad
* incidentally, this needs more work first
* some things
* weh
* sound cleanup and icons
* reeeee
* compile issues
* oh look, fresh code sync
* cleans up some unused icons
* dirty vars
* reeeeeeeeeeeeeeee
* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
LetterJay
a5ec18d566
Merge pull request #6185 from Citadel-Station-13/upstream-merge-36816
...
[MIRROR] Fixes mutant bodypart assignments
2018-04-01 19:50:58 -05:00
Jordan Brown
c97d4e0970
Merge pull request #36796 from neersighted/delete_perms
...
Make the delete verb check for SPAWN|DEBUG
2018-03-31 06:17:58 -05:00
ShizCalev
1c76539a5b
Fixes mutant bodypart assignments
2018-03-31 06:15:24 -05:00
CitadelStationBot
12829e5cad
[MIRROR] Little changes and standardisation of some admin commands ( #5781 )
...
* Little changes and standardisation of some admin commands
* Update randomverbs.dm
* Update randomverbs.dm
* tab boi
2018-03-04 09:39:41 -06:00
CitadelStationBot
d446d0ed6d
[MIRROR] Admin combohud verb ( #5785 )
...
* Admin combohud verb (#36096 )
* combohuds
* Update randomverbs.dm
* Admin combohud verb
2018-03-04 05:26:22 -06:00
Sirenfal
44dc6ac3a0
Antagonist reputation system
2018-03-02 14:38:26 -06:00
CitadelStationBot
9e229691cc
Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines ( #5304 )
2018-02-05 04:23:09 -06:00
ShizCalev
68cfdb617b
Fixes rev mindswap ( #34567 )
2018-01-21 12:29:12 -06:00
Jordan Brown
f3627b8428
Merge pull request #34331 from Shadowlight213/expplayervisibility
...
Players can now see their own tracked playtime
2018-01-19 08:45:02 -06:00
deathride58
0dbc2241ea
modules: A to C
2018-01-04 00:46:53 -05:00
BeeSting12
7dac76651e
Makes it clear that command reports are IC. ( #33949 )
...
* fixes #33936
* sticky's idea was better
2017-12-31 02:28:25 -06:00
Emmett Gaines
9d0a4722e5
turns the baseturf var into a part time list ( #33705 )
2017-12-25 19:11:06 -06:00
AnturK
6c4d687db6
Immovable rod abuse, smite and event trigger. ( #33681 )
2017-12-21 00:11:20 -06:00
LetterJay
2148eb021b
Update randomverbs.dm
2017-12-19 19:34:44 -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
deathride58
7179547be4
Merge branch 'master' into upstream-merge-31727
2017-12-10 21:51:51 +00:00
Jordan Brown
8b9e15d1b5
Merge pull request #33324 from deathride58/foreignfurryaddswidescreen
...
[Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
2017-12-08 10:35:23 -06:00
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
