shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,246 Commits 5 Branches 0 Tags
dbd08a18a45012ee6ea0b2c4af2c76da8037a1b5
Commit Graph

456 Commits

Author SHA1 Message Date
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) 
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
 2017-12-11 16:36:38 -08:00
deathride58
d6573f602d Merge pull request #4313 from Citadel-Station-13/upstream-merge-33148 
[MIRROR] Allowed shuttle docking ports to be hidden from some shuttle docking computers
 2017-12-10 23:50:20 +00:00
deathride58
57ab98d8bc Merge pull request #4315 from Citadel-Station-13/upstream-merge-33152 
[MIRROR] Airlock Construction Update
 2017-12-10 23:49:51 +00:00
deathride58
216b0931d1 Merge pull request #4250 from Citadel-Station-13/upstream-merge-32935 
[MIRROR] Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more
 2017-12-10 22:43:58 +00:00
deathride58
7179547be4 Merge branch 'master' into upstream-merge-31727 2017-12-10 21:51:51 +00:00
uraniummeltdown
d6b0683846 Airlock Construction Update 2017-12-10 15:23:34 -06:00
Cruix
746e57bd86 Allowed shuttle docking ports to be hidden from some shuttle docking computers 2017-12-10 14:23:08 -06:00
coiax
9d59e36289 Add caltrop component for spikey floor objects (#33280) 
* Add caltrop component for spikey floor objects

The caltrop component now can be added to any crossable atom, and it'll
act like a shard of glass, or a d4. Additional flags are possible for it
to bypass shoes or ignore people who are walking.

This means d4 don't reimplement shard logic, and also open the window
for caltrop grenades later.

Also, it taught me how components work.

* Code review I

* Caltrop damage is 4

* Cactus hurts

* Whoops

* Ignore restraints = true
 2017-12-10 10:32:03 -06:00
Jordan Brown
7a90baa1f8 Merge pull request #33390 from duncathan/atmos-defines 
cleans up atmos defines
 2017-12-09 15:53:34 -06:00
kevinz000
75eab09dff Revert "[MIRROR] [ready]Timer queuing tweaks: binary sorted inserts and rolling buckets." 2017-12-08 19:16:49 -08:00
Kyle Spier-Swenson
811517ecb2 [ready]Timer queuing tweaks: binary sorted inserts and rolling buckets. (#33098) 
* Timer queuing tweaks: binary sorted inserts and rolling buckets.

Client time timers now uses a binary search algorithm for its sorted inserts.

Processing now uses a binary sorted insert, rather then sorting it with sortTim during bucket_shifts.

Buckets now automatically wrap around rather then get regenerated every minute. (Rolling queue)

* Fixes some queue management bugs.

* Fixes a Order of Operations goof up in the ticks<->ds macros.

@ninjanomnom your pain is my success

* Remove debug line

* Fixes some binary insert bugs, fixes client time timers, moved id over to GUID

* Fixes initialization-time timers fucking everything up
 2017-12-08 15:02:18 -06:00
Ashe Higgs
0ae0c44991 Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more 2017-12-06 16:37:15 -06:00
deathride58
988baf6781 Update stat.dm 2017-12-06 13:28:08 -05:00
deathride58
f768647ac6 Update DNA.dm 2017-12-06 13:26:43 -05:00
XDTM
988dbe87da Brain Traumas 2017-12-06 12:05:20 -06:00
deathride58
d923d355f2 Merge pull request #4242 from Citadel-Station-13/upstream-merge-32950 
[MIRROR] Adds support for non-1:1 screen ratios (Doesn't add widescreen)
 2017-12-06 17:50:28 +00:00
deathride58
c1cd970cc4 Merge pull request #4236 from Citadel-Station-13/upstream-merge-33274 
[MIRROR] Removes ComponentActivated in favor of callbacks
 2017-12-06 03:53:35 +00:00
deathride58
c56003f6ff Adds support for non-1:1 screen ratios (Doesn't add widescreen) (#32950) 
* adds support for non-1:1 screen ratios for fullscreen overlays

* prevents future copypasta, adds widescreen support to clickcatchers

* oops, makes it actually compile

* HOPEFULLY makes it actually compile, makes projectiles and mouse_angle_from_client support widescreen

* i need shittier shitcode

* !!!HOPEFULLY!!! fixes the screen fuckery

* Fixes compiling errors. Tested locally, it seems like it works

* fixes runtime in mouse_angle_from_client

* Fixes non-1:1 TGUI runtimes for borgs and ghosts

* adds actual defines for fullscreen overlay resolution

* makes varediting view call change_view to make clickcatcher regenerate proper

* testmerge toggle widescreen verb and fixes vving view

* FUCK - fixes test verb to properly use change_view, so clickcatchers regenerate and such

* fixes parallax runtimes - how'd i miss this

* removes debug verb
 2017-12-05 19:46:20 -06:00
Jordan Brown
e1f658a50d Removes ComponentActivated in favor of callbacks 2017-12-05 15:42:47 -06:00
Robustin
1490c56d22 Reverts sound range and falloff so as to not carry as far (#33259) 
* Reverts triple sound range

* Reverts sound falloff
 2017-12-05 15:41:36 -06:00
deathride58
379f73d1e1 Merge branch 'master' into upstream-merge-32249 2017-12-04 23:15:38 +00:00
deathride58
21d5e8999c Merge branch 'master' into upstream-merge-32624 2017-12-04 17:12:53 -05:00
deathride58
b9731895fd Merge pull request #4076 from Citadel-Station-13/upstream-merge-32858 
[MIRROR] Divides species in subtypes, makes viruses able to infect certain subtypes
 2017-12-04 21:57:29 +00:00
deathride58
371ceb8d23 Update components.dm 2017-12-04 16:21:41 -05:00
kevinz000
66c66f0bd7 [READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on 2017-12-03 15:33:29 -06:00
MoreRobustThanYou
29ba71765c Datumizes saymodes 2017-12-03 12:56:03 -06:00
Emmett Gaines
b8e754500c Bitflag returns from component signals (#33186) 
* For more useful returns from sendsignal

* removes a needless else/indentation

* cleanup
 2017-12-01 13:09:22 -06:00
Cruix
b23c92b056 Added bot path data huds 2017-11-28 06:28:40 -06:00
deathride58
9e0aac69f3 Merge pull request #4136 from Citadel-Station-13/upstream-merge-33034 
[MIRROR] More integrated circuit fixes and code improvements
 2017-11-27 05:17:50 +00:00
deathride58
59b8731370 Update misc.dm 2017-11-26 21:20:54 -05:00
ShizCalev
4a22fed89d Cleans up goldcore defines 2017-11-26 16:51:44 -06:00
ACCount
0be326633d More integrated circuit fixes and code improvements 2017-11-26 04:56:44 -06:00
Dorsisdwarf
6dea43c709 Advanced Laserpointer Feline Interaction 2017-11-24 17:56:58 -06:00
oranges
c43591982a Refactor on_reagent_change to pass through the change type 2017-11-24 12:59:09 -06:00
deathride58
5fb8856480 Update subsystems.dm 2017-11-22 20:07:57 -05:00
deathride58
fc2a0f48fa Update DNA.dm 2017-11-22 17:45:15 -05:00
oranges
c2c22d56c7 [READY]NTnet refactor, assimilates exonet 2017-11-22 15:52:54 -06:00
XDTM
783960a986 Divides species in subtypes, makes viruses able to infect certain subtypes 2017-11-22 15:36:43 -06:00
oranges
cec6c028f5 [READY]Refactors uplinks to a component! 2017-11-22 15:17:03 -06:00
deathride58
51a7c4a543 Merge pull request #4057 from deathride58/manualmirrors2 
Manually mirrors #32838 and #32462 from upstream
 2017-11-21 20:00:18 +00:00
deathride58
ddbb5c34d4 manual mirrors 2017-11-21 14:06:28 -05: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
LetterJay
c3b60e502e Merge pull request #3882 from Citadel-Station-13/upstream-merge-32371 
[MIRROR] SSoverlay improvements and tweaks
 2017-11-14 14:56:34 -06:00
arsserpentarium
d8847ea167 [READY]integrated circuitry port+upgrade. 2017-11-14 05:00:48 -06:00
LetterJay
36778e9404 Merge pull request #3919 from Citadel-Station-13/upstream-merge-32623 
[MIRROR] Adds ambience for Reebe.
 2017-11-13 11:53:21 -06:00
LetterJay
304cfeb262 Merge pull request #3914 from Citadel-Station-13/upstream-merge-31947 
[MIRROR] Pirate ship event
 2017-11-13 11:52:40 -06:00
LetterJay
07cb443ba0 Merge pull request #3913 from Citadel-Station-13/upstream-merge-32553 
[MIRROR] Xrays go through walls but stop on mobs/blob
 2017-11-13 11:51:59 -06:00
LetterJay
a21a5cf30d Merge pull request #3906 from Citadel-Station-13/upstream-merge-32640 
[MIRROR] Adds a multitool_act and a proper check on tool_check
 2017-11-13 11:46:41 -06:00
LetterJay
55e2d08b06 Merge pull request #3901 from Citadel-Station-13/upstream-merge-32566 
[MIRROR] Space vacuum damage doubled
 2017-11-13 11:44:33 -06:00