Commit Graph

67 Commits

Author SHA1 Message Date
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
fd6df15f93 Merge branch 'master' into upstream-merge-26131 2017-05-02 09:19:49 -05:00
LetterJay
3b8484b52b Merge pull request #579 from Citadel-Station-13/upstream-merge-26129
[MIRROR] Unorphans the blackbox
2017-05-02 05:13:49 -05:00
LetterJay
a8e6de5795 manual merge 2017-05-02 05:06:13 -05:00
CitadelStationBot
1426a20834 Gaining Vanguard will remove existing stuns 2017-05-01 11:07:33 -05:00
LetterJay
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
LetterJay
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
LetterJay
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
CitadelStationBot
7a4f1496e9 Changes a lot of ticker and ticker.mode checks to SSticker.hasRoundStarted 2017-05-01 07:24:45 -05:00
CitadelStationBot
87e306851d Readds deepstorage w/ tweaks AND adds water bottles to vending machines 2017-05-01 07:24:41 -05:00
CitadelStationBot
9be1a5db4f Moves antag datums to the mind 2017-04-30 14:32:15 -05:00
CitadelStationBot
fccbe18286 Status effects are actually deleted/handled when the mob is deleted 2017-04-29 16:50:50 -05:00
LetterJay
06bfa8770e Merge branch 'master' into upstream-merge-26129 2017-04-29 11:45:37 -05:00
CitadelStationBot
4da7414339 Old ore processor cleanup 2017-04-29 03:46:03 -05:00
lm40
67300fc3b2 Update emotes.dm 2017-04-28 20:17:21 -04:00
LetterJay
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
CitadelStationBot
caaf42815a Changes some << to to_chat 2017-04-28 06:14:47 -05:00
CitadelStationBot
df4f3aaaad Adds a delete verb to the vv_drop_down 2017-04-27 17:10:44 -05:00
CitadelStationBot
bba83f9291 Lowers max list size in vv 2017-04-26 20:15:54 -05:00
CitadelStationBot
08a01aa11b Refactors roundstart checks slightly 2017-04-26 17:06:29 -05:00
CitadelStationBot
bde5d6253a Unorphans the blackbox 2017-04-26 17:05:23 -05:00
CitadelStationBot
3d2f91d0c7 Removes a lavaland_surface_ww_vault.dmm because its just bad. (#536) 2017-04-26 11:08:30 -05:00
Poojawa
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
CitadelStationBot
4cf23d086a Fixed nulls in the active_alternate_appearances list (#568) 2017-04-26 10:11:22 -05:00
CitadelStationBot
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
CitadelStationBot
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
LetterJay
73456c9e9a REJECT CLEANUP. FUUUUUUUUUUUUUUUUUUCK. 2017-04-25 21:40:46 -05:00
LetterJay
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
CitadelStationBot
fb61c31470 Small abductors refactor 2017-04-25 03:59:08 -05:00
LetterJay
3d51a07243 world fix 2017-04-25 01:52:49 -05:00
CitadelStationBot
607868a5de [s]Exploit whack-a-mole 2017-04-25 01:31:50 -05:00
CitadelStationBot
defa9d863c >We still let old code in the codebase 2017-04-24 21:22:11 -05:00
CitadelStationBot
387caa518f Changed alternate appearances to /datum/atom_hud s 2017-04-23 13:26:08 -05:00
Poojawa
f866139c52 Admin ticket tgstyle (#493)
* some porting

* other changes
2017-04-20 22:00:47 -05:00
CitadelStationBot
02b1e41ec3 Fixes action transfer 2017-04-19 14:07:49 -05:00
CitadelStationBot
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
Poojawa
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
Poojawa
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
ktccd
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
TalkingCactus
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
Poojawa
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
TalkingCactus
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
LetterJay
42816f916c removes replace_text for them/their to his/her 2017-02-28 21:04:37 -06:00
Poojawa
0bca862419 Overhauls and 2/28 sync (#244)
* map tweaks/shuttle engines

* helpers and defines

* global/onclick

* controllers and datums

* mapping

* game folder

* some other stuff

* some modules

* modules that aren't mobs

* some mob stuff

* new player stuff

* mob living

* silicon stuff

* simple animal things

* carbon/ayylmao

* update_icons

* carbon/human

* sounds and tools

* icons and stuff

* hippie grinder changes + tgui

* kitchen.dmi

* compile issues fixed

* mapfix

* Mapfixes 2.0

* mapedit2.0

* mapmerger pls

* Revert "mapedit2.0"

This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481.

* clean up vore folder + 2 hotfixes

* admin ticket refinement

* Blob tweaks and LAZYADD

* LAZYADD IS LAZY

* Magic strings purged

* DEFINES NEED HIGHER PRIORITIES

* Only a sleepless idiot deals in absolute TRUE|FALSE

* u h g

* progress bar fix

* reverts ticket logs

* there's always that one guy

* fixes and stuff

* 2/27 fixes

* game folder stuff

* stats

* some modules again

* clothing stuff

gets vg clothing out of the main files

* everything not mobs again

* mob stuff

* maps, tgui, sql stuff

* icons

* additional fixes and compile errors

* don't need this anymore

* Oh right this isn't needed anymore

* maint bar re-added

* that doesn't need to be here

* stupid events

* wtfeven

* probably makes Travis happy

* don't care to fix the grinder atm

* fixes vending sprites, changes turret

* lethal, not lethals

* overylays are finicky creatures

* lazy fix for bleeding edgy (#252)

* map tweaks/shuttle engines

* helpers and defines

* global/onclick

* controllers and datums

* mapping

* game folder

* some other stuff

* some modules

* modules that aren't mobs

* some mob stuff

* new player stuff

* mob living

* silicon stuff

* simple animal things

* carbon/ayylmao

* update_icons

* carbon/human

* sounds and tools

* icons and stuff

* hippie grinder changes + tgui

* kitchen.dmi

* compile issues fixed

* mapfix

* Mapfixes 2.0

* mapedit2.0

* mapmerger pls

* Revert "mapedit2.0"

This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481.

* clean up vore folder + 2 hotfixes

* admin ticket refinement

* Blob tweaks and LAZYADD

* LAZYADD IS LAZY

* Magic strings purged

* DEFINES NEED HIGHER PRIORITIES

* Only a sleepless idiot deals in absolute TRUE|FALSE

* u h g

* progress bar fix

* reverts ticket logs

* there's always that one guy

* fixes and stuff

* 2/27 fixes

* game folder stuff

* stats

* some modules again

* clothing stuff

gets vg clothing out of the main files

* everything not mobs again

* mob stuff

* maps, tgui, sql stuff

* icons

* additional fixes and compile errors

* don't need this anymore

* Oh right this isn't needed anymore

* maint bar re-added

* that doesn't need to be here

* stupid events

* wtfeven

* probably makes Travis happy

* don't care to fix the grinder atm

* fixes vending sprites, changes turret

* lethal, not lethals

* overylays are finicky creatures
2017-02-28 09:30:49 -06:00
TalkingCactus
36c580c236 The Update (#241)
* auto vote runtime error fix

* part 1

* adds a wolf pai sprite

modified fox sprite that doesn't make your eyes bleed

* missed a painful sprite

* part 2

* ptwhatever

* save

* conflict resolution pt1

* conflict resolution pt2

* almost done with the preferences shit

* fixes missing arousal HUD

* file rename

* even more

* keep the panic commits coming

* forgot one

* wew, gonna go make some small changes

* s o o n

* LOOC admin and player toggles

* fixed backpacks and taurs clipping on the preview

* fixed penis length saving

* typo fix

* arousal fix

* icon tuning

* final
2017-02-24 21:42:15 -05:00
Poojawa
fc2dbcd9fe Tg port 2 15 (#230)
* defines/helpers

* globalvars, onclick, controllers

* datums and game

* woooooooooorld. Uh. dm

* modules sans mobs client admin

* modules/admin

* pref shit

* modules/mob

* icon updates

* extra things

* Cherrypicked fixes from open PRs

* metastation.tgm fix

* a better meta fix

* reverts async breakings
2017-02-15 03:35:32 -06:00
Poojawa
6674f9fc15 Tg 2 11 sync (#215)
* first series of updates

* datums

* games folder

* admin and atmosia stuffs

* moar

* mob updates borg riding

* sprites and stuff

* fixes for various things

* oops. some missed fixes
2017-02-12 03:56:14 -06:00
Poojawa
449614df96 Actually cleans up un-needed files. (#210)
* actually gets rid of excess files

* obsolete admin files
2017-02-08 22:35:56 -06:00
Poojawa
f6dfa820fd onclick and datums 2017-02-07 23:55:43 -06:00