CitadelStationBot
c91006c27f
[MIRROR] Create ERT refactor ( #5924 )
...
* Create ERT refactor (#36321 )
cl Naksu
admin: ERT creation has been refactored to allow for easier customization and deployment via templates and settings
/cl
* Create ERT refactor
2018-03-12 07:30:03 -05:00
LetterJay
d2607c0654
Merge pull request #5702 from Citadel-Station-13/upstream-merge-35639
...
[MIRROR] Refactors anti-magic into a component
2018-02-25 16:59:38 -06:00
Ashe Higgs
a7d5e4cdcf
Refactors butchering to a component - item-based butchering effectiveness, speed, and chances ( #35744 )
...
* Butchering component
* auto-butchering based on toolspeed
* Gives drills their butchering back
* redoes toggles
2018-02-25 14:50:29 -06:00
XDTM
493623c827
Refactors anti-magic into a component
2018-02-25 14:45:51 -06:00
AnturK
3e12e1b2f6
Some antag fixes. ( #35690 )
...
* Removes misleading comment
* Fixes devil ascension visible in lobby
* Fixes nuke op reinforcements.
* ADVANCED COPYPASTE
* Missed this one.
2018-02-16 10:35:55 -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
Poojawa
03086dfa91
Tg 1 28 sync testing/confirmation ( #5178 )
...
* maps, tgui, tools
* defines and helpers
* onclick and controllers
* datums
fucking caught that hulk reversal too.
* game and shuttle modular
* module/admin
* oh god they fucking moved antag shit again
* haaaaate. Haaaaaaaaaate.
* enables moff wings
* more modules things
* tgstation.dme
before I forget something important
* some mob stuff
* s'more mob/living stuff
* some carbon stuff
* ayy lmaos and kitchen meat
* Human stuff
* species things
moff wings have a 'none' version too
* the rest of the module stuff.
* some strings
* misc
* mob icons
* some other icons.
* It compiles FUCK BORERS
FUCK BORERS
2018-01-29 04:42:29 -06:00
deathride58
ca9ce2058e
Merge pull request #4917 from Citadel-Station-13/upstream-merge-34529
...
[MIRROR] changes the null rod's description to reflect its use against clockwork cults
2018-01-19 00:32:26 +00:00
Jordan Brown
a38dc60466
Merge pull request #34529 from Xhuis/nullroddesc
...
changes the null rod's description to reflect its use against clockwork cults
2018-01-18 16:56:26 -06:00
ThePainkiller
f2c5a8ae2a
Spellcheck: Fixed a typo on holy_weapons.dm ( #34561 )
2018-01-18 16:46:13 -06:00
ShizCalev
594de23c1f
Fixes buckled message spam for ghosts inside talking scythes ( #34111 )
...
* Fixes buckled message spam for ghosts
* params
2018-01-10 03:48:10 -06:00
deathride58
d8facb3bce
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05: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
Jordie
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
KorPhaeron
74c6e7e23f
Fixes godhand having no inhand sprite ( #31744 )
...
* Fixes godhand having no inhand
* Correct file paths
2017-10-16 14:34:11 -05:00
Armhulen
cf155736cf
New Chaplain Weapon: Hammer of Pride! ( #31454 )
...
* cool beans
* i think this works
* i'm only human after all
don't put the blame on me
* is this what you wanted??
* ya
* K
2017-10-13 23:44:39 -05:00
ExcessiveUseOfCobblestone
fe5b45dfeb
Fixes Carpsie nullrod from being invisible ( #31268 )
2017-10-04 11:00:34 -05:00
vuonojenmustaturska
11a3395690
Tiny batch of Initialize() fixes, mostly stuff that isn't around at roundstart
2017-09-24 17:42:13 -05:00
LetterJay
e16d89d077
Merge pull request #2923 from jughu/hi-hello
...
Allows custom renaming for holy weapons
2017-09-24 15:49:19 -04:00
jughu
617eb4c889
The new hip
2017-09-24 01:04:39 +02:00
jughu
5b1b550c0e
Update holy_weapons.dm
2017-09-24 00:34:24 +02:00
CitadelStationBot
222274d108
[MIRROR] Using a soulstone on somebody now transfers your languages to the shade ( #2911 )
...
* Merge pull request #30939 from MoreRobustThanYou/patch-8
Using a soulstone on somebody now transfers your languages to the shade
* Using a soulstone on somebody now transfers your languages to the shade
2017-09-23 05:53:56 -05:00
CitadelStationBot
ada383e629
[MIRROR] Clarifies the egyptian staff desc ( #2811 )
...
* Clarifies the egyptian staff desc (#30765 )
* Clarifies the egyptia staff desc
* I can't write
* Clarifies the egyptian staff desc
2017-09-17 12:03:12 -05:00
ExcessiveUseOfCobblestone
f63a75b137
Egyptian Clothing, Egyptian Null Rod, Craftable Mummy Costume!
2017-09-10 17:08:36 -05:00
LetterJay
24a7aa5a9f
Merge branch 'master' into upstream-merge-30079
2017-09-06 09:24:23 -05:00
CitadelStationBot
5f3775388c
Gives cult blades updated item and inhand sprites
2017-08-29 17:08:43 -05:00
kevinz000
5591afc9ce
double wew
2017-08-29 09:53:11 -07:00
kevinz000
3254fcf535
goddamnit_again ( #2511 )
2017-08-26 18:43:57 -07:00
kevinz000
c638386507
Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. ( #2460 )
...
* fuck pubby
* fuck you too ceres
* ree
* this is going to be a disaster isn't it
* disaster
* dme
* -_-
* tg
* woops
* proper sync
* Welcome to conflict hell.
* lets hope this fixes more things than it breaks
* gdi
* goddamnit
2017-08-24 21:07:58 -07:00
