cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
76,831 Commits 6 Branches 0 Tags
27c70dd1448c04466ae70d55db4a4bd2093b78dc
Commit Graph

178 Commits

Author SHA1 Message Date
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
ShadowLarkens
3f191e4204 NanoUI Goes To Brazil 2020-09-20 02:36:46 -07:00
ShadowLarkens
097d4fa283 TGUI Research 2020-08-25 13:30:47 -07:00
Razgriz
02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
Razgriz
3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
Aronai Sieyes
8bf7178d61 Just remove on_loc_moved entirely 2020-05-18 15:13:20 -04:00
Aronai Sieyes
190e8bdd5a Try to ensure some mobs don't end up processing in SSmobs 2020-05-17 09:40:39 -04:00
Arokha Sieyes
323f7e651f Fix/rename some timing stuff 2020-05-08 01:51:52 -04:00
Razgriz
81ad690b89 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull 2020-05-06 22:36:01 -07:00
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Aronai Sieyes
f2314c32bb Merge pull request #7405 from VOREStation/vplk-static-machinery-power 
Static Machinery Power
 2020-04-24 21:06:52 -04:00
Leshana
763753648b Implements "static" area machinery power usage 
- Instead of using auto_use_power to re-tally up machinery's power usage every cycle, track the steady "static" load separately from the transient "oneoff" usage.  Machines then only need to inform the area when they use oneoff power or *change* their steady usage.
- Remove auto_use_power and stop SSmachines from calling it.
- Add vars to track "static" usage for each of the three power channels to /area
- Rename the existing three vars to "oneoff" so its clear what they mean (and to catch people accidentally updating them directly)
- Update area power procs and APCs to use the new variables.
- Rename /area/proc/use_power() to use_power_oneoff() to make it clear what it is doing.
- Deprecate /obj/machinery/use_power() in favor of use_power_oneoff() but don't delete yet.  Can transition gradually.
- Add logic to the update_power procs on machines to calculate the deltas and update static area power whenever their usage changes.
- Add logic to machines to update area power when they are created, destroyed, or move.
- Moved /obj/machinery procs related to area power usage into machinery_power.dm to make them easier to find.
- Added or updated comments in several places to explain what is going on and how to use it.
 2020-04-23 19:04:34 -04:00
ShadowLarkens
139d5cd3c3 Saycode Overhaul -- Multilingualism 2020-04-20 04:12:53 -04:00
Erik
eb9c3cd387 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020 2020-04-11 16:53:35 -07:00
Atermonera
7249375011 Splits circuit clothes IC interaction to ctrl-shift-click (#6968) 2020-04-10 01:19:48 -04:00
Atermonera
d7a9416bb8 Clean up various things 2020-04-03 03:15:06 -04:00
Arokha Sieyes
1d9e5be122 Replace \image macro with bicon() 2020-02-19 19:55:01 -05:00
Erik
11268a3ff4 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into MyUpstreamMerge 2020-02-13 20:36:32 -08:00
Atermonera
e4528a99bf Merge pull request #6616 from Shadow-Quill/Sign-Lang-Translator-Fix 
Sign Language translator now properly works
 2020-01-15 23:10:43 -05:00
TheFurryFeline
816a49145c Appease Travis 2020-01-14 17:29:23 -05:00
Razgriz
5ce1acaf58 Merge pull request #138 from CHOMPStation2/Razgriz1032-patch-16 
Indent fix
 2020-01-13 20:22:43 -07:00
Razgriz
e3b5cd6c0b Update tools.dm 2020-01-13 19:47:35 -07:00
Razgriz
de24521619 First merge from upstream 2020-01-13 17:23:01 -07:00
Razgriz
5e21c5b07f Shut up Travis 2020-01-13 14:36:42 -07:00
Razgriz
271b293a63 Merge pull request #131 from CHOMPStation2/Sharkmare-Drone++ 
Assembly (Drone) buff
 2020-01-12 21:41:26 -07:00
Sharkmare
edad5a6d89 woop 2020-01-12 19:29:31 +01:00
Sharkmare
5b4321cb1f Assembly (Drone) buff 
Upgrades drone assembles to be between medium and large assembly size.
As it currently stands all you can make with drone assemblies really is meme shit and nothing that would actually be beneficial, unless you remove the locomotion circuit at which point you can just use an unmovable large assembly.

Assemblies could use an overhaul in general but this is the biggest flaw.
 2020-01-12 19:22:12 +01:00
Sharkmare
ad69d617bd Forgot the new one 2020-01-12 02:16:20 +01:00
Sharkmare
2d3990b23e Fixing the can hold list of the circuit bag again 2020-01-12 00:13:22 +01:00
Atermonera
3b7a737c08 Change various global species lists to GLOB versions, adds 2 more event subspecies. 2019-12-16 00:52:29 -05:00
Atermonera
9ba1566211 EPv2 x Communicator fix. 2019-12-15 14:54:01 -05:00
Atermonera
e4abffb8a4 Merge pull request #6469 from Verkister/patch-23 
Fixes runtime cascade on advanced locator circuit
 2019-10-01 02:38:09 -04:00
Atermonera
7fc19250e6 Merge pull request #6419 from Mechoid/PrinterHREF 
Should solve the I.C. printer HREF exploit.
 2019-08-26 23:33:03 -04:00
Atermonera
e60f0daf47 Merge pull request #6295 from Mechoid/TTS_And_Sign 
Adds an advanced TTS circuit, and sign-camera.
 2019-08-05 18:52:48 -04:00
Anewbe
07811148c3 Merge pull request #6343 from Nalarac/Circuits 
Fixes Integrated Circuit Printer Taking Fractions of a Sheet
 2019-07-27 13:06:42 -04:00
Heroman3003
ca13a8872c MC camera and access fixes and adjustments (#6269) 
* Adjusts MC camera program, fixes ID program

* Fixes oversight with network access
 2019-07-09 14:01:53 -04:00
Anewbe
7b724d59d5 Merge pull request #6224 from MagmaRam/IC_input_fix 
Fix for some electronics buttons having the wrong label on their pulses.
 2019-06-21 18:26:35 -04:00
Neerti
01fdfe00e6 Fixes some signaler bugs 2019-04-15 18:30:15 -04:00
Neerti
30b967e28a Items are now assumed to be conductive, rather than the opposite 2019-03-28 21:45:38 -04:00
Novacat
cefd175858 Update time.dm 2019-03-28 14:41:14 -04:00
Novacat
09228247c2 Merge branch 'master' into upstream-merge-5897 2019-03-28 14:39:41 -04:00
Neerti
fe0b7373b3 Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it 2019-03-27 14:49:30 -04:00
Novacat
1d0bb53293 Merge pull request #4597 from VOREStation/upstream-merge-5786 
[MIRROR] Fixes issue #5788.
 2019-03-27 03:03:40 -04:00
Neerti
86174593bf Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer 2019-03-26 23:58:26 -04:00
Atermonera
131636b1d2 Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding 2019-03-26 13:21:08 -04:00
Spades
6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -05:00
Poojawa
8d178972a1 ports #4581 Startup Runtime fix 2019-02-02 06:03:40 -06:00
Poojawa
6f2548e47b Merge remote-tracking branch 'refs/remotes/origin/master' into upstream/upstream-merge-5735 2019-02-02 03:55:21 -06:00