Commit Graph

54 Commits

Author SHA1 Message Date
Ashe Higgs
0a449af83e Adds minor roundstart traits! (ala CDDA, etc.) 2018-03-02 14:38:18 -06:00
Jordan Brown
29f0dc8006 Merge pull request #34417 from kevinz000/patch-431
Removes SS_KEEP_TIMING from SSprojectiles
2018-01-14 22:02:40 -06:00
LetterJay
69930a192d Update networks.dm 2017-12-17 17:51:28 -06:00
oranges
75753a4dfd Defines all subsystem priority values 2017-12-15 17:00:50 -06:00
JStheguy
9313fd65cf Adds Additional Electronic_Assembly Designs (#33466)
* bloats electronic_setups.dmi

* new assembly naming scheme, redone legacy sprites
2017-12-13 21:10:41 -06:00
deathride58
21d5e8999c Merge branch 'master' into upstream-merge-32624 2017-12-04 17:12:53 -05:00
oranges
c2c22d56c7 [READY]NTnet refactor, assimilates exonet 2017-11-22 15:52:54 -06:00
ACCount
8a64287249 Integrated circuit fixes and code improvements 2017-11-21 03:04:17 -06:00
LetterJay
bbef661092 Merge pull request #3927 from Citadel-Station-13/upstream-merge-32481
[MIRROR] [READY]integrated circuitry port+upgrade.
2017-11-14 15:51:03 -06:00
arsserpentarium
d8847ea167 [READY]integrated circuitry port+upgrade. 2017-11-14 05:00:48 -06:00
Kyle Spier-Swenson
2d8fc6de61 SSoverlay improvements and tweaks (#32371)
* Overlay per-type cost logging.

Overlays will now log how long each type took to process.

Changed up how overlays was done to account for the fact its a queue and not a processor. (it was using almost none of the processing subsystem framework)

Made the overlay loop faster by making it not cut the list until the end.

Added a simple generic benchmark stat tracking system.

I don't know how much overhead this adds to overlays. i may put it behind testing or something, but i do want to test this on the serbers to get some stats.

* Removes flush() as it was creating race conditions

* Use ref

* text2file

* Atoms added as an overlay will have their pending overlays compiled before being converted to an appearance
2017-11-10 13:26:23 -06:00
YPOQ
f4d0108beb build_appearance_list no longer edits the list it is passed (#32066)
* build_appearance_list no longer edits the list it is passed

* Mistakes were made

* Update overlays.dm
2017-10-27 17:35:13 -05:00
oranges
c3dbb8925b Merge pull request #31987 from Cyberboss/InlineCO
May as well shave some yaks
2017-10-26 05:05:09 -05:00
kevinz000
ed96224d3a Moves projectile processing to a subsystem 2017-10-15 21:51:24 -05:00
kevinz000
93647d77ad [DNM] Fixes the codebase (#2556)
* fixes stuff

* goddamnit flags
2017-08-30 00:08:40 -07:00
kevinz000
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
kevinz000
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
LetterJay
b01a24c95b my eyes hurt 2017-08-22 01:42:20 -05:00
CitadelStationBot
87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
CitadelStationBot
e6d6478482 Small belt overlay rewrite, and tool overlays for toolbelts 2017-07-19 09:30:06 -05:00
CitadelStationBot
ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
CitadelStationBot
0eb8d9549a Speeds up SSoverlays 2017-07-06 19:21:40 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
bb34fa8c8a Speeds up SSoverlays 2017-07-01 13:55:20 -05:00
LetterJay
5117b3ea88 Merge pull request #1458 from Citadel-Station-13/upstream-merge-28146
[MIRROR] Makes processing subsystems respect qdel and PROCESS_KILL
2017-06-14 08:54:17 -05:00
CitadelStationBot
9a8778b16f Adds /image/proc/copy_overlays 2017-06-09 20:11:51 -05:00
CitadelStationBot
0c2e0d5fb2 Makes processing subsystems respect qdel and PROCESS_KILL 2017-06-07 14:17:28 -05:00
CitadelStationBot
7abd50a97d If you're gonna make a subsystem do it right 2017-05-23 13:45:27 -05:00
CitadelStationBot
4463646952 [MIRROR] MC Runlevels (#988)
* MC Runlevels

* Update ticker.dm

* Delete ticker.dm.rej
2017-05-18 12:42:43 -05:00
kevinz000
e8fe273cc0 Update flightpacks.dm 2017-05-04 16:07:53 -07: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
CitadelStationBot
4baa357739 Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker 2017-04-24 18:07:12 -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
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
Verkister
98cb8767b5 Stealing overlay fix from tg.
Also forgot one tailwag sprite last time.
2017-03-19 01:46:56 +02:00
Verkister
62705e87f6 git is being a butt again 2017-03-18 14:10:14 +02:00
Verkister
df8d69535b New attempt at fixing shit. Also some sprite stuff.
-Messed around with another air proc I saw runtiming on server.
-Attempted to fix overlays even further. Test run successful but you never know with random chances that hopefully are now as low as the test run let me see.
-Meddled around with transit space. 2 directions were missing a corrective step against negative rng output.
-Added otie snouts.
-Improved contrast in the corvid markings.
-Added tail wag sprites for husky and otie.
2017-03-18 14:08:10 +02:00
Verkister
00b7dce512 Merge branch 'master' into master 2017-03-18 12:05:51 +02:00
Verkister
81956b0502 Inhand overlays fixed.
Whoa this succeeded on the first try unlike yesterday's crap :v
2017-03-18 12:02:50 +02:00
Verkister
edc44b2cc5 Overlay fix for the inhand borkage.
Whoa this thing actually succeeded on the first time unlike yesterday's shit :v
2017-03-18 11:59:03 +02:00
LetterJay
9ce20fae93 Revert "Revert "Revert "Little but possibly hella important fixes""" 2017-03-17 22:44:45 -05:00
LetterJay
e41e97a9e9 Revert "Overlay fix" 2017-03-17 22:43:41 -05:00
Verkister
3e2cf6ec14 Overlay fix
This took way too long lmao.
Also manually edited the file in github since doing anything the right way is a goddamn shitfest on this system :v
2017-03-17 20:13:34 +02:00
Verkister
545dec9826 Revert "Revert "Little but possibly hella important fixes"" 2017-03-16 09:14:53 +02:00
LetterJay
ed435e7e2f Revert "Little but possibly hella important fixes" 2017-03-15 20:20:22 -05:00
Verkister
41d47301dd Separated the goddamn overlay direction quirk between mobs and turfs since apparently they both misused the same shit in a different way, conflicting like crap! 2017-03-15 13:52:39 +02:00
Verkister
bb879dfac8 -Fixes overlay stuff such as character creation preview. (one of main runtime issues out there currently)
-Probably fixes a missing proc with air runtimes too, which has been one of the problemos appearing in tandem with MC borkage (next line under was MC related anyway)
-Husky tail wag sprites renamed correctly (inverted color order). Actual movement yet to come.
2017-03-15 10:52:00 +02: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
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
3f8df133d8 other things I missed 2017-02-08 00:49:31 -06:00