cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-12 02:43:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,357 Commits 55 Branches 0 Tags
ea47d74997658924a6b50676a9f1dbf0cac1852d
Commit Graph

94 Commits

Author SHA1 Message Date
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
Leo
2221d854a1 Merge pull request #33446 from tgstation/Cyberboss-patch-3 
INVOKE_ASYNC is the exception not the rule!
 2017-12-11 20:39:38 -06:00
deathride58
6e6b85c01a Merge pull request #4311 from Citadel-Station-13/upstream-merge-33276 
[MIRROR] Restores the uplink modules, removes LoadComponents
 2017-12-10 23:49:25 +00:00
oranges
d88bff9fa9 Restores the uplink modules, removes LoadComponents 2017-12-10 14:14:37 -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
deathride58
742d50b5e7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization 
# Conflicts:
#	code/citadel/custom_loadout/custom_items.dm
#	code/datums/components/riding.dm
#	code/game/objects/items/implants/implantuplink.dm
#	icons/mob/neck.dmi
#	icons/obj/clothing/cloaks.dmi
 2017-12-08 19:58:41 -05:00
deathride58
7ca945c96b Merge pull request #4278 from Citadel-Station-13/upstream-merge-33370 
[MIRROR] Fixes certain material containers
 2017-12-08 19:35:43 +00:00
Jordan Brown
dfaa796fc2 Fixes certain material containers 2017-12-08 12:11:46 -06:00
Jordan Brown
8b9e15d1b5 Merge pull request #33324 from deathride58/foreignfurryaddswidescreen 
[Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
 2017-12-08 10:35:23 -06: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
Jordan Brown
76746cd57a Minor component optimizations (#33269) 
* Minor component optimizations

* Second argument of list.Copy is optional
 2017-12-05 15:52:19 -06:00
Jordan Brown
e1f658a50d Removes ComponentActivated in favor of callbacks 2017-12-05 15:42:47 -06:00
deathride58
f57e02ce95 Merge branch 'master' into donoritemmodularization 2017-12-04 20:17:02 -05:00
deathride58
379f73d1e1 Merge branch 'master' into upstream-merge-32249 2017-12-04 23:15:38 +00:00
deathride58
3c578b0c46 Update _component.dm 2017-12-04 18:04:10 -05:00
deathride58
21d5e8999c Merge branch 'master' into upstream-merge-32624 2017-12-04 17:12:53 -05:00
deathride58
1998c3ff5c Update _component.dm 2017-12-04 16:15:14 -05:00
Jordan Brown
e36f4a5b22 SendSignal optimization 2017-12-04 05:29:56 -06: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
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
Leo
e9daba0cd3 Merge pull request #32984 from ninjanomnom/thermite-burns 
Fixes thermite burning lava
 2017-11-24 14:10:26 -06:00
deathride58
eb722bf59f Merge branch 'master' into upstream-merge-33045 2017-11-24 00:10:36 +00:00
Jordan Brown
b2bb942817 Fixes component runtimes 2017-11-23 13:12:38 -06:00
Leo
598f0dc580 Merge pull request #32979 from tgstation/Cyberboss-patch-4 
Adds some sanity checks to component creation
 2017-11-23 05:47:32 -06:00
deathride58
c76cacdf77 Merge pull request #4081 from Citadel-Station-13/upstream-merge-32914 
[MIRROR] [READY]NTnet refactor, assimilates exonet
 2017-11-23 01:40:54 +00:00
LetterJay
eba36e48f9 Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188 
[MIRROR] JSON feedback
 2017-11-22 18:42:34 -06:00
oranges
c2c22d56c7 [READY]NTnet refactor, assimilates exonet 2017-11-22 15:52:54 -06:00
oranges
cec6c028f5 [READY]Refactors uplinks to a component! 2017-11-22 15:17:03 -06:00
Tad Hardesty
38c45fb479 Refactor chasm paths to be more sane (#32701) 
In addition, makes chasm handling a component, so it could be reused for
chasm-likes which are not quite chasms.

Also fixes a couple of bugs relating to building on top of chasms
occasionally erasing the chasm.
 2017-11-22 03:30:49 -06:00
deathride58
1f6b3ce629 Merge branch 'master' into upstream-merge-32188 2017-11-21 19:53:58 +00:00
deathride58
ddbb5c34d4 manual mirrors 2017-11-21 14:06:28 -05:00
Jordan Brown
2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
Jordie
2f8d8b8729 Merge pull request #32865 from ninjanomnom/decal-examine 
Lets you add examine text to component decals
 2017-11-19 22:36:01 -06:00
Jordie
b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
Emmett Gaines
95707bf1b7 fixes 512 compile reminders (#32582) 2017-11-11 14:33:22 -06:00
Emmett Gaines
70d75c3988 fixes radioactive half life (#32511) 2017-11-09 00:45:40 -06:00
LetterJay
448326cd60 Merge pull request #3856 from Citadel-Station-13/upstream-merge-32466 
[MIRROR] Fixes turf_decal layering
 2017-11-08 02:21:13 -06:00
ShizCalev
88e7e8d2cb Fixes turf_decal layering 2017-11-07 21:38:53 -06:00
Emmett Gaines
8fb5936c30 fixes null parent in destroy for components (#32351) 
* fixes parent being null in destroy

* extends qdel
 2017-11-07 14:35:46 -06:00
Jordan Brown
03e7e0e58c Cleans up signal redirector (#32368) 2017-11-03 15:53:18 -05:00
Emmett Gaines
ec597c411e Signal redirection component (#32298) 
* redirection component

* makes register signal accept callbacks

* this is a very lightweight component
 2017-11-02 16:05:04 -05:00
CitadelStationBot
9bda3f16c2 Merge pull request #3735 from Citadel-Station-13/upstream-merge-31942 
[MIRROR] Shuttle rotation refactor and significant performance upgrade
 2017-11-02 04:06:31 -05:00
LetterJay
d9a29dbda2 Merge branch 'master' into upstream-merge-32307 2017-11-01 07:22:39 -04:00
LetterJay
eb8b49071a Merge pull request #3725 from Citadel-Station-13/upstream-merge-32158 
[MIRROR] Replace most islist calls in components with length()
 2017-11-01 01:42:42 -04:00
oranges
17873819b3 Adds a temporary workaround for a BYOND bug 2017-10-31 21:20:13 -05:00
Emmett Gaines
a9f07518a7 Shuttle rotation refactor and significant performance upgrade 2017-10-31 20:23:57 -05:00
Jordan Brown
55653fa1ee Replace most islist calls in components with length() (#32158) 
islist was used to check if a thing was

A. A list of things
B. 1 thing

length was profiled to be faster
 2017-10-31 15:12:42 -05:00
Jordan Brown
0e037767cd Minor optimization for _GetInverseTypeList (#32155) 
* Minor optimization for _GetInverseTypeList

* We also need to make sure the root component is never instantiated to avoid stack overflows
 2017-10-31 15:11:25 -05:00
Jordan Brown
47f88be07f Fixes TakeComponent (#32156) 
* Fixes TakeComponent

* Add the note about OnTransfer and COMPONENT_INCOMPATIBLE

* Fix behaviour

* Missed datum.dm
 2017-10-30 03:53:00 -05:00