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

736 Commits

Author SHA1 Message Date
Jordan Brown
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
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
deathride58
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
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
YPOQ
f7d5ab5baf Fixes some broken random events (#33345) 2017-12-08 10:34:50 -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
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
deathride58
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
deathride58
fec2c32ec7 Merge pull request #4224 from Citadel-Station-13/upstream-merge-33237 
[MIRROR] Fixes robeless apprentice
 2017-12-05 20:13:38 +00:00
MoreRobustThanYou
d5cf1b3fec [s] Fix changeling chat (#33305) 
* Fix changeling chat

* Update say.dm
 2017-12-05 13:43:03 -06:00
AnturK
47ffd28850 Fixes robeless apprentice 2017-12-05 03:23:54 -06:00
oranges
d6f9871bd3 Merge pull request #33251 from tgstation/Cyberboss-patch-3 
Reduces the volume of showers
 2017-12-05 03:23:22 -06:00
Dax Dupont
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
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
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
5ecab0d993 Merge pull request #4211 from Citadel-Station-13/upstream-merge-33220 
[MIRROR] SendSignal optimization
 2017-12-04 21:30:01 +00:00
deathride58
4ddbe28068 Merge pull request #4209 from Citadel-Station-13/upstream-merge-32868 
[MIRROR] Holorecord disks.
 2017-12-04 21:29:44 +00:00
deathride58
1a32bdc053 Merge pull request #4199 from Citadel-Station-13/upstream-merge-33013 
[MIRROR] Datumizes saymodes
 2017-12-04 21:19:53 +00: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
AnturK
1cc3e33714 Holorecord disks. 2017-12-04 05:14:13 -06:00
deathride58
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
deathride58
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
deathride58
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
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
ExcessiveUseOfCobblestone
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
MoreRobustThanYou
29ba71765c Datumizes saymodes 2017-12-03 12:56:03 -06:00
jammer312
b1e15a0da2 Crash to timers and INFINITY check to beams. (#33219) 
* beams

* timers

* >= instead of !=

* whooops
 2017-12-03 12:45:27 -06:00
LetterJay
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
ExcessiveUseOfCobblestone
ae5221371f Revolutionaries can now see deconversion message regardless of status (#33202) 2017-12-02 17:47:30 -06:00
FrozenGuy5
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
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
Emmett Gaines
9601136df2 sm soundtweak (#33154) 2017-11-30 17:01:29 -06:00
deathride58
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
4eceef7693 Merge pull request #4155 from Citadel-Station-13/upstream-merge-32967 
[MIRROR] Added bot path data huds
 2017-11-30 04:34:25 +00:00
deathride58
2f42366856 Merge pull request #4158 from Citadel-Station-13/upstream-merge-33109 
[MIRROR] Cancels camera view on teleport
 2017-11-29 03:25:46 +00:00
Jordan Brown
cfb7749903 Merge pull request #33109 from ShizCalev/camera-teleport 
Cancels camera view on teleport
 2017-11-28 06:29:05 -06:00
Cruix
b23c92b056 Added bot path data huds 2017-11-28 06:28:40 -06:00
JJRcop
cd7cbc7f59 Fixes VV Make Space Ninja verb (#32982) 2017-11-28 06:27:45 -06:00
Leo
00f7be5c36 Merge pull request #33072 from AnturK/ibelievedinyoukornowlook 
Fixes non-advanced diseases vaccines.
 2017-11-27 08:25:55 -06:00
deathride58
80d1d03b1d Update weight.dm 2017-11-26 21:32:24 -05:00
deathride58
1d50248da3 Update hulk.dm 2017-11-26 21:29:20 -05:00
deathride58
940f70ff5f Update mutations.dm 2017-11-26 21:28:35 -05:00