Commit Graph

70 Commits

Author SHA1 Message Date
kevinz000
b33d2b82fb Merge branch 'master' into mirror-38933 2018-07-14 15:26:49 -07:00
kevinz000
bcb1b04c40 Upstream mirror 2018-07-14 15:24:35 -07:00
JStheguy
02744c59a5 [READY] Helps data disks stop being unemployed (#38319)
* data cards actually have a function now

* Adds data cards to the IC printer for real rea

* more cards, less shitty code

* how the fuck did I miss that

adds a missing ..()

* wait wrong use of ..() fuck
2018-06-19 09:23:33 -05:00
vuonojenmustaturska
83ac5852dd Turn /datum.isprocessing into a datum flag (#38193) 2018-06-05 18:00:21 -05:00
oranges
e0412f6325 Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code 2018-05-06 16:37:13 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
AnturK
31efa96a01 Fixes some defines. (#37223) 2018-04-16 08:32:48 -05:00
kevinz000
44a273f6b8 Changes ntnet address assignment from numerical ascending to 16 hexadecimal randomized seeded (in English, everything is now randomized instead of predictable) (#37167)
* Emergency NTNet patch

* ok

* @naksu

* explicit null
2018-04-14 04:43:25 -05:00
deathride58
ebc51d94bf Merge pull request #6119 from Citadel-Station-13/upstream-merge-36398
[MIRROR] [READY]pathfinding circuitry upgrade
2018-03-27 17:47:11 +00:00
arsserpentarium
303272319a [READY]pathfinding circuitry upgrade (#36398)
* all in one

* fixfixfix

* uhhhh

* demuxdemuxdemuxdemux

* wire eriw

* icon noci

* tihsxifixshit

* rewopower

* fixif

* screeneercs

* returnruter
2018-03-26 11:01:22 -05:00
kevinz000
4773743eab Fixes wet floor scaling (#36697)
* Fixes wet floor scaling

* Meh lets not
2018-03-26 10:49:42 -05:00
CitadelStationBot
009f95db42 [MIRROR] Electronic assembly changes and additions (#6014)
* Electronic assembly changes and additions

* Electronic assembly changes and additions (#36394)

* the rainbow of mediocrity rides again

* whoops that wasn't supposed to be there
2018-03-19 21:11:23 -05:00
kevinz000
f78fea7333 [READY] Refactors wet floors to a component (#36130)
* Wet Floor components

* No more turf wet slide.
2018-03-17 07:53:11 -05:00
Poojawa
452b58d1a1 makes traits more paranoid, also removes the double application (#5929) 2018-03-14 17:28:42 -05:00
Poojawa
95cb6b23f2 controllers, datums, game 2018-03-06 21:16:46 -06:00
CitadelStationBot
c8107c52cc [MIRROR] Adjusts fire priorities of flightpacks, research, networks, and fields. (#5809)
* Adjusts fire priorities of flightpacks, research, networks, and fields. (#36129)

* Fire priorities

* research lower not higher

* Don't need to keep timing if it's automatically compensating for missed ticks.

* Spelling

* spelling

* Adjusts fire priorities of flightpacks, research, networks, and fields.
2018-03-05 13:01:49 -06:00
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