7179547be4
Merge branch 'master' into upstream-merge-31727
2017-12-10 21:51:51 +00:00
d82698d106
Merge pull request #4302 from Citadel-Station-13/upstream-merge-33280
...
[MIRROR] Add caltrop component for spikey floor objects
2017-12-10 14:20:40 -06:00
de13c6c799
Merge pull request #4293 from Citadel-Station-13/upstream-merge-33395
...
[MIRROR] switches lobes for grammar n shit
2017-12-10 14:20:02 -06:00
563517ab4a
Merge pull request #4287 from Citadel-Station-13/upstream-merge-33378
...
[MIRROR] Makes godwoken syndrome a bit more reliable
2017-12-10 14:19:51 -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
906ed84674
Merge pull request #33386 from AutomaticFrenzy/patch/type-too-long
...
Remove meaningless "Type too long" message from VV
2017-12-09 15:53:42 -06:00
8b41dacba9
switches lobes for grammar n shit
2017-12-09 15:53:27 -06:00
8502e058b2
Makes godwoken syndrome a bit more reliable
2017-12-09 01:58:18 -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
53ab4feb2f
Merge pull request #4270 from Citadel-Station-13/upstream-merge-33324
...
[MIRROR] [Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
2017-12-08 18:47:56 +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
f7d5ab5baf
Fixes some broken random events ( #33345 )
2017-12-08 10:34:50 -06:00
3f92e40503
Update sensory.dm
2017-12-06 13:18:45 -05:00
988dbe87da
Brain Traumas
2017-12-06 12:05:20 -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
6171f2160b
Merge pull request #4220 from Citadel-Station-13/upstream-merge-33251
...
[MIRROR] Reduces the volume of showers
2017-12-05 20:21:32 +00:00
44d54c66f1
Merge pull request #4215 from Citadel-Station-13/upstream-merge-33230
...
[MIRROR] Adds disco inferno shuttle.
2017-12-05 20:18:21 +00:00
fec2c32ec7
Merge pull request #4224 from Citadel-Station-13/upstream-merge-33237
...
[MIRROR] Fixes robeless apprentice
2017-12-05 20:13:38 +00:00
d5cf1b3fec
[s] Fix changeling chat ( #33305 )
...
* Fix changeling chat
* Update say.dm
2017-12-05 13:43:03 -06:00
47ffd28850
Fixes robeless apprentice
2017-12-05 03:23:54 -06:00
d6f9871bd3
Merge pull request #33251 from tgstation/Cyberboss-patch-3
...
Reduces the volume of showers
2017-12-05 03:23:22 -06:00
91cc5b1024
Adds disco inferno shuttle. ( #33230 )
...
* Adds disco inferno shuttle
* step be gone
* Minor wall replacement
* Add no diagonal walls
* Made the dance machine all access
* Makes the statues work as I originally intended in this shuttle
* Fixes a chair
* Changed door and made it to keep fire inside.
2017-12-05 03:22:40 -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
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
5ecab0d993
Merge pull request #4211 from Citadel-Station-13/upstream-merge-33220
...
[MIRROR] SendSignal optimization
2017-12-04 21:30:01 +00:00
4ddbe28068
Merge pull request #4209 from Citadel-Station-13/upstream-merge-32868
...
[MIRROR] Holorecord disks.
2017-12-04 21:29:44 +00:00
1a32bdc053
Merge pull request #4199 from Citadel-Station-13/upstream-merge-33013
...
[MIRROR] Datumizes saymodes
2017-12-04 21:19:53 +00:00
1998c3ff5c
Update _component.dm
2017-12-04 16:15:14 -05:00
e36f4a5b22
SendSignal optimization
2017-12-04 05:29:56 -06:00
1cc3e33714
Holorecord disks.
2017-12-04 05:14:13 -06:00
e42fa29e96
Merge pull request #4200 from Citadel-Station-13/upstream-merge-33204
...
[MIRROR] Being buckled to a bed now saves you from "the floor is lava"
2017-12-03 23:29:42 +00:00
fc132ff72a
Merge pull request #4197 from Citadel-Station-13/upstream-merge-33219
...
[MIRROR] Crash to timers and INFINITY check to beams.
2017-12-03 23:24:53 +00:00
a376c25790
Merge pull request #4194 from Citadel-Station-13/upstream-merge-33202
...
[MIRROR] Revolutionaries can now see deconversion message regardless of status
2017-12-03 23:23:01 +00: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
0df9db51f3
Being buckled to a bed now saves you from "the floor is lava" ( #33204 )
...
* Update floor_is_lava.dm
* Switcheroo
* )))))))))))))
2017-12-03 13:16:37 -06:00
29ba71765c
Datumizes saymodes
2017-12-03 12:56:03 -06:00
b1e15a0da2
Crash to timers and INFINITY check to beams. ( #33219 )
...
* beams
* timers
* >= instead of !=
* whooops
2017-12-03 12:45:27 -06:00
bf64a40e8f
Merge pull request #4182 from Citadel-Station-13/upstream-merge-33199
...
[MIRROR] Prevents the PA from being EMP'd
2017-12-03 06:12:15 -06:00
ae5221371f
Revolutionaries can now see deconversion message regardless of status ( #33202 )
2017-12-02 17:47:30 -06:00
65dbabab89
Prevents the PA wires from being EMP'd ( #33199 )
...
* returns emp_act
* jordie for code owner
2017-12-02 09:43:42 -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
9601136df2
sm soundtweak ( #33154 )
2017-11-30 17:01:29 -06:00
6ac2a8c9a0
Merge pull request #4133 from Citadel-Station-13/upstream-merge-32432
...
[MIRROR] [Super-Ready for review]Reworks healing symptoms into conditional healing symptoms
2017-11-30 04:43:51 +00:00
deathride58