7b6f278c87
Mania Motors now do minor damage and continue to affect targets after they leave its range
2017-05-04 00:16:08 -05:00
f333944be0
le fix
2017-05-03 09:02:19 -05:00
6a365857d1
Should fix all of the cult/clockcult issues
2017-05-02 20:44:34 -05:00
368a2e82c1
Merge pull request #709 from Citadel-Station-13/upstream-merge-26762
...
[MIRROR] Fixes cult datum giving the action button to the mind instead of mob
2017-05-02 18:47:55 -05:00
84db006ea9
Merge pull request #711 from Citadel-Station-13/upstream-merge-26799
...
[MIRROR] Fixes cult and clockcult icons
2017-05-02 18:46:38 -05:00
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
fd6df15f93
Merge branch 'master' into upstream-merge-26131
2017-05-02 09:19:49 -05:00
3b8484b52b
Merge pull request #579 from Citadel-Station-13/upstream-merge-26129
...
[MIRROR] Unorphans the blackbox
2017-05-02 05:13:49 -05:00
a8e6de5795
manual merge
2017-05-02 05:06:13 -05:00
22f6aecdf7
Fixes cult and clockcult icons
2017-05-01 21:03:40 -05:00
3fff6d4a1d
Fixes cult datum giving the action button to the mind instead of mob
2017-05-01 20:27:03 -05:00
1426a20834
Gaining Vanguard will remove existing stuns
2017-05-01 11:07:33 -05:00
3d6845675a
Merge pull request #679 from Citadel-Station-13/upstream-merge-26709
...
[MIRROR] Readds deepstorage w/ tweaks AND adds water bottles to vending machines
2017-05-01 08:10:13 -05:00
7261d61983
Merge pull request #672 from Citadel-Station-13/upstream-merge-26717
...
[MIRROR] Moves antag datums to the mind
2017-05-01 08:09:22 -05:00
061e49d651
Merge pull request #654 from Citadel-Station-13/upstream-merge-26662
...
[MIRROR] Status effects are actually deleted/handled when the mob is deleted
2017-05-01 07:59:55 -05:00
7a4f1496e9
Changes a lot of ticker and ticker.mode checks to SSticker.hasRoundStarted
2017-05-01 07:24:45 -05:00
87e306851d
Readds deepstorage w/ tweaks AND adds water bottles to vending machines
2017-05-01 07:24:41 -05:00
9be1a5db4f
Moves antag datums to the mind
2017-04-30 14:32:15 -05:00
fccbe18286
Status effects are actually deleted/handled when the mob is deleted
2017-04-29 16:50:50 -05:00
06bfa8770e
Merge branch 'master' into upstream-merge-26129
2017-04-29 11:45:37 -05:00
4da7414339
Old ore processor cleanup
2017-04-29 03:46:03 -05:00
67300fc3b2
Update emotes.dm
2017-04-28 20:17:21 -04:00
f7fa4d9843
Merge pull request #615 from Citadel-Station-13/upstream-merge-26187
...
[MIRROR] Adds a delete verb to the vv_drop_down
2017-04-28 08:18:07 -05:00
caaf42815a
Changes some << to to_chat
2017-04-28 06:14:47 -05:00
df4f3aaaad
Adds a delete verb to the vv_drop_down
2017-04-27 17:10:44 -05:00
bba83f9291
Lowers max list size in vv
2017-04-26 20:15:54 -05:00
08a01aa11b
Refactors roundstart checks slightly
2017-04-26 17:06:29 -05:00
bde5d6253a
Unorphans the blackbox
2017-04-26 17:05:23 -05:00
3d2f91d0c7
Removes a lavaland_surface_ww_vault.dmm because its just bad. ( #536 )
2017-04-26 11:08:30 -05:00
8ec4cbbb9f
Fixes carelessness. ( #577 )
...
* Update hud.dm
* Delete hud.dm.rej
* Update alternate_appearance.dm
* Delete alternate_appearance.dm.rej
* Delete mob.dm.rej
* Update mob.dm
2017-04-26 10:37:57 -05:00
4cf23d086a
Fixed nulls in the active_alternate_appearances list ( #568 )
2017-04-26 10:11:22 -05:00
84321916a5
Refactors ears into organs ( #513 )
...
* Refactors ear damage into ear organs
* Update human.dm
* Update species.dm
* Delete species.dm.rej
* Update tgstation.dme
* Delete tgstation.dme.rej
* Delete human.dm.rej
* Update tongue.dm
* Delete surgery.dmi
* upload fixed surgery.dmi
2017-04-26 09:52:35 -05:00
a905c15dad
Replaces /image with /mutable_appearance ( #556 )
...
* Replaces /image with /mutable_appearance, where appropriate
* Update miscellaneous.dm
* Delete miscellaneous.dm.rej
* Delete pet.dm.rej
* Update pet.dm
* Update species.dm
* Update miscellaneous.dm
* Update species.dm
* Update miscellaneous.dm
* Delete species.dm.rej
* Update species.dm
pretty sure I got all the indentation correct THIS time, ffs
* Update species.dm
* Update species.dm
fucking tabs man, fucking tabs.
2017-04-26 08:18:35 -05:00
73456c9e9a
REJECT CLEANUP. FUUUUUUUUUUUUUUUUUUCK.
2017-04-25 21:40:46 -05:00
6dc70fc02f
Merge pull request #526 from Citadel-Station-13/upstream-merge-26289
...
[MIRROR] Changed alternate appearances to /datum/atom_hud s
2017-04-25 21:39:14 -05:00
fb61c31470
Small abductors refactor
2017-04-25 03:59:08 -05:00
3d51a07243
world fix
2017-04-25 01:52:49 -05:00
607868a5de
[s]Exploit whack-a-mole
2017-04-25 01:31:50 -05:00
defa9d863c
>We still let old code in the codebase
2017-04-24 21:22:11 -05:00
387caa518f
Changed alternate appearances to /datum/atom_hud s
2017-04-23 13:26:08 -05:00
f866139c52
Admin ticket tgstyle ( #493 )
...
* some porting
* other changes
2017-04-20 22:00:47 -05:00
02b1e41ec3
Fixes action transfer
2017-04-19 14:07:49 -05:00
fe57757fd7
Adds a proc to check if the current thread is from an admin advanced proc call ( #400 )
2017-04-15 14:41:36 -04:00
9e72b1b8fd
/tg/ 4/14 ( #367 )
...
* outside code stuff
* defines, helpers, etc
* everything not module
* modules
* compiled fixes + missing sounds
2017-04-14 23:28:04 -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
2707ddd750
Cloning-Genitalia-Fix ( #277 )
...
* Cloning-Genitalia-Fix
Fixes the issue with genitals not being re-created with cloning. This
should make it so other methods of coming back also gives the organs
your DNA says you should have, such as podding people.
* Sanity checks and fixes
Removed the OLD sanity check for drawing eyes. It was refusing to draw
eyes if you had ANY disability. 's far as I know, blind people still
have eyes and so do mute people.
Also, put a sanity check in give_genitals, just in case a species has
DNA with genitals but is a NOGENITALS species. Somehow. IT COULD HAPPEN,
ALRIGHT?! ^^
* TRAVIS LOVE ME AGAIN
This commit fixes the problem that made Travis hate me previously. Even
though THAT part of the code had not been changed...
Anyway, it looks more neat now, so that's good.
2017-04-01 11:40:12 -04:00
c997ebcabd
Removes Lag (tm) ( #313 )
...
* sensible fixes
* this too
* some more
* fixes chair icons
reverted to state before tg pull
* fixes telecomms icons
revert to state before tg pull
* fixes research icons
reverted to before tg pull
* de-whitewashed the stools
* fixed missing broadcaster sprites
* always load from the savefile
helps custom servers who don't want to fuck with the config, this will
never not be wanted with the system we have
* stop it, ghosts
* fixes limb augmentation
https://github.com/tgstation/tgstation/pull/25446
* removes lag
* re-adds sounds
* exception
* makes travis happy
2017-03-26 09:39:29 -04: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
09ec454325
Random Fixes + Dildos ( #268 )
...
* I'LL SNEAK THIS IN, TOO
* will it blend
* event tweaking
* new kinkmate sprite
* savefile bugfixes
* drinks got overwritten again
rip
* replaces missing styles
* dildos
* last bit
2017-03-10 12:51:16 -05:00
42816f916c
removes replace_text for them/their to his/her
2017-02-28 21:04:37 -06:00
CitadelStationBot