7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
cc0b768c72
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES ( #4014 )
...
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES
* resetting all the maps because we can worry about them later.
* Regexing
* I'm fucked
* Fixes
* .
* maps
* bleh
* ree
* fixes
2017-12-11 16:36:38 -08:00
eba36e48f9
Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188
...
[MIRROR] JSON feedback
2017-11-22 18:42:34 -06:00
3b1067ba7a
Update pants.dm
2017-11-22 14:56:26 -05:00
c5adadc5d1
Update engineering.dm
2017-11-22 14:54:01 -05:00
5d2c5add1f
Update color.dm
2017-11-22 14:50:37 -05:00
6ab499b57b
Fixes bartender suit having an adjust state
2017-11-22 12:40:32 -06:00
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
5bb8a1b962
Merge pull request #32853 from KorPhaeron/purple
...
Fixes purple bartender clothes
2017-11-19 22:55:03 -06:00
eeba86e27e
Merge branch 'master' into upstream-merge-32188
2017-11-18 05:31:42 +00:00
0beef30fb7
Adds a purple bartender suit and apron, and Long Hair 3 - Requested and sprites by Okand37! ( #3993 )
2017-11-17 19:02:40 -08:00
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
1068b8f22d
Merge pull request #32456 from vuonojenmustaturska/ghostmemes
...
[s] Removes a handful of ways ghosts can affect the world
2017-11-06 21:48:42 -06:00
d0789ecaf9
Splits clothing.dm in 7 other files
2017-10-21 19:01:30 -05:00
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
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
f63adc1931
Fixes various Nanotrasen capitalizations ( #31620 )
...
* Fixes capitalization of Nanotrasen for secsuits
gimme the GBP
* Fixes this one too
2017-10-13 12:13:26 -05:00
3a83b28bae
Adds the Cargo-Tech-of-the-Shift award
2017-10-01 09:43:20 -05:00
4bc6e9d522
[MIRROR] Cleaned up some decimal values. ( #2797 )
...
* Cleaned up some decimal values.
* Update gas_mixture.dm
* Update color.dm
* Update medsci.dm
2017-09-18 01:45:39 -05:00
0eb8cf0235
Icon_override, Plasma weapon tweaks & gunlocker. AK-47 Summoning ( #2759 )
...
* In hands of plasma weapons/tweaks
* Icon override states for all clothes
* a few compile issues ~
* Adds a new badmin button and plasma rifle case
* better cleanup of the sound effect
* Oh, these should've been deleted already.
2017-09-16 04:29:22 -05:00
f63a75b137
Egyptian Clothing, Egyptian Null Rod, Craftable Mummy Costume!
2017-09-10 17:08:36 -05:00
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
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
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
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
cdbaf5c4e8
Standardized CENTCOM spelling
2017-08-08 09:05:44 -05:00
64b721ae4f
Halloween Costumes ( #2169 )
2017-07-28 23:51:11 -07:00
106cdfc37b
[MIRROR] Fixes the maid costume's apron ( #2010 )
...
* Fixes the maid costume's apron
* Delete admins.txt.rej
2017-07-14 19:29:55 -07:00
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
919f9f0cfc
Turns the maid costume's apron into a detachable accessory.
2017-06-24 15:40:03 -05:00
d04001c09d
another huge sync
2017-06-21 18:00:00 -05:00
c877fdb501
Merge branch 'master' into upstream-merge-28046
2017-06-14 13:10:37 -05:00
47687a6d1a
cleanup
2017-06-10 09:42:08 -05:00
522b6d917f
updates
2017-06-10 09:36:39 -05:00
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
f03aa5e0fa
Adds some more syndicate equipment.
2017-06-05 13:50:54 -05:00
ab50a3eca5
Merge pull request #1068 from Citadel-Station-13/upstream-merge-27283
...
[MIRROR] Decentralized and Vastly Improved Gang Influence System
2017-05-22 16:28:57 -05:00
7df5632d6e
Minor Grammar Fixes
2017-05-21 22:28:29 -05:00
c39b60b3cf
Decentralized and Vastly Improved Gang Influence System
2017-05-20 18:37:48 -05:00
7a9e05e9d9
Cerestation Tweaks MK VII: BEES edition ( #925 )
2017-05-18 10:36:51 -05:00
a317d23a51
[MIRROR] Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie ( #916 )
...
* Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie
* fixes .rej
2017-05-18 09:37:30 -05:00
33a93a611b
Curator Update
2017-05-03 22:22:12 -05:00
2bef665038
Merge pull request #613 from Citadel-Station-13/upstream-merge-26563
...
[MIRROR] Renames generic armor and athletic shorts
2017-05-02 11:14:47 -05:00
4a2e1367b5
Renames generic armor and athletic shorts
2017-04-27 17:01:29 -05:00
b45d053ac6
When jumpsuits take severe damage, their suit sensors break.
2017-04-27 02:32:35 -05:00
9d532385c6
Removed commented code from ties.dm
2017-04-17 16:16:41 -05:00
7e9b96a00f
April sync ( #360 )
...
* Maps and things no code/icons
* helpers defines globalvars
* Onclick world.dm orphaned_procs
* subsystems
Round vote and shuttle autocall done here too
* datums
* Game folder
* Admin - chatter modules
* clothing - mining
* modular computers - zambies
* client
* mob level 1
* mob stage 2 + simple_animal
* silicons n brains
* mob stage 3 + Alien/Monkey
* human mobs
* icons updated
* some sounds
* emitter y u no commit
* update tgstation.dme
* compile fixes
* travis fixes
Also removes Fast digest mode, because reasons.
* tweaks for travis Mentors are broke again
Also fixes Sizeray guns
* oxygen loss fix for vore code.
* removes unused code
* some code updates
* bulk fixes
* further fixes
* outside things
* whoops.
* Maint bar ported
* GLOBs.
2017-04-13 23:37:00 -05:00
45548d26c6
THIS (DOESN'T) VIOLATE THE NAP
...
Clothing 2: If it doesn't pass i'm seriously going to stop trying
boogaloo
2017-04-01 22:50:05 -05:00
f67e9f6d87
Bleeding edgy refresh ( #303 )
...
* not code stuff
* other things
* global vars, defines, helpers
* onclick hud stuff, orphans, world.dm
* controllers and datums
* game folder
* everything not client/mobs in modules
* client folder
* stage 1 mob stuff
* simple animal things
* silicons
* carbon things
* ayylmaos and monkeys
* hyoomahn
* icons n shit
* sprite fixes
* compile fixes
* some fixes I cherrypicked.
* qdel fixes
* forgot brain refractors
2017-03-21 11:44:10 -05:00
LetterJay