e4410a3320
Merge branch 'master' into mapsyncs43293845982
2018-01-08 06:18:11 +00:00
cbe0a9a05d
Fixes component forensics deleting old instead of new component. ( #34058 )
...
* component dupe unique
* sorry I was using webeditor on phone and it wouldn't let me tab
2018-01-07 21:50:23 -06:00
d2ec28b1e6
Merge branch 'master' into mapsyncs43293845982
2018-01-07 20:23:00 +00:00
e7641dd004
Made the squeek component not make things squeak so often ( #34082 )
2018-01-05 06:00:08 -06:00
d26a9b23a4
datums folder
2018-01-03 23:29:47 -05:00
f581b2d94d
Makes the decal component handle updating inventory icons
2018-01-02 15:18:31 -06:00
168519c328
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32311
2018-01-01 07:00:34 -06:00
d0e5a38c29
Merge pull request #33954 from jammer312/components_fix
...
fixes component's dupe
2017-12-31 09:59:16 -06:00
b260704381
Merge pull request #4530 from Citadel-Station-13/upstream-merge-33705
...
[MIRROR] Turns the baseturf var into a part time list
2017-12-30 13:19:00 -06:00
a3ebaa5de8
Merge branch 'master' into upstream-merge-32311
2017-12-29 18:38:50 -06:00
4e1770a21f
Fixes admin fingerprintslast
2017-12-29 00:28:55 -06:00
269208f687
[READY]Component Forensics and Item Blood OverlayS!
2017-12-27 15:19:14 -06:00
2da318a9a5
Merge pull request #33820 from tgstation/Cyberboss-patch-4
...
Material containers only insert on help intent
2017-12-26 09:25:14 -06:00
9d0a4722e5
turns the baseturf var into a part time list ( #33705 )
2017-12-25 19:11:06 -06:00
af1f13e114
Merge pull request #33306 from coiax/replace-clean-flag-with-component
...
Replaces CLEAN_ON_MOVE_1 flag with cleaning component
2017-12-23 08:36:37 -06:00
8750d93126
Merge branch 'master' into upstream-merge-33614
2017-12-21 05:02:21 -06:00
09c802f984
Merge pull request #33550 from ninjanomnom/instanceless-component-dupe
...
Adds instanceless component dupe mode
2017-12-21 00:51:02 -06:00
25d5e5b6b4
Merge pull request #33594 from AnturK/knockoff
...
Adds knock off component
2017-12-20 00:14:36 -06:00
408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
8149f52777
Adds jousting ( #33531 )
2017-12-18 20:54:21 -06:00
ed91ccdeff
Update decal.dm
2017-12-18 15:14:55 -06:00
e026115045
Decal rotation fix
2017-12-17 20:49:51 -06:00
f875d4e176
Defines math, take 2
2017-12-17 10:02:43 -06:00
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
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
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
d88bff9fa9
Restores the uplink modules, removes LoadComponents
2017-12-10 14:14:37 -06:00
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
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
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
dfaa796fc2
Fixes certain material containers
2017-12-08 12:11:46 -06:00
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
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
76746cd57a
Minor component optimizations ( #33269 )
...
* Minor component optimizations
* Second argument of list.Copy is optional
2017-12-05 15:52:19 -06:00
e1f658a50d
Removes ComponentActivated in favor of callbacks
2017-12-05 15:42:47 -06:00
f57e02ce95
Merge branch 'master' into donoritemmodularization
2017-12-04 20:17:02 -05:00
379f73d1e1
Merge branch 'master' into upstream-merge-32249
2017-12-04 23:15:38 +00:00
3c578b0c46
Update _component.dm
2017-12-04 18:04:10 -05:00
21d5e8999c
Merge branch 'master' into upstream-merge-32624
2017-12-04 17:12:53 -05:00
1998c3ff5c
Update _component.dm
2017-12-04 16:15:14 -05:00
e36f4a5b22
SendSignal optimization
2017-12-04 05:29:56 -06:00
66c66f0bd7
[READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on
2017-12-03 15:33:29 -06:00
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
e9daba0cd3
Merge pull request #32984 from ninjanomnom/thermite-burns
...
Fixes thermite burning lava
2017-11-24 14:10:26 -06:00
eb722bf59f
Merge branch 'master' into upstream-merge-33045
2017-11-24 00:10:36 +00:00
b2bb942817
Fixes component runtimes
2017-11-23 13:12:38 -06:00
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
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
eba36e48f9
Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188
...
[MIRROR] JSON feedback
2017-11-22 18:42:34 -06:00
deathride58