shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,824 Commits 5 Branches 0 Tags
fec2c32ec7330f45cf38f398e30aa23bf60ceeb8
Commit Graph

721 Commits

Author SHA1 Message Date
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
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
Ashe Higgs
6c553d17a4 Splits mutations from mutations.dm into a subfolder, /datums/mutations 2017-11-26 14:54:13 -06:00
deathride58
b6a51532ed Merge pull request #4111 from Citadel-Station-13/upstream-merge-32984 
[MIRROR] Fixes thermite burning lava
 2017-11-26 02:19:15 +00:00
XDTM
7a5af2f237 [Super-Ready for review]Reworks healing symptoms into conditional healing symptoms 2017-11-25 18:54:33 -06:00
MoreRobustThanYou
8f23eeb003 Fix #32755 (#33073) 2017-11-25 15:17:42 -06:00
deathride58
f92bc0c938 Merge pull request #4098 from Citadel-Station-13/upstream-merge-32805 
[MIRROR] Refactor on_reagent_change to pass through the change type
 2017-11-24 23:47:13 +00:00
Leo
e9daba0cd3 Merge pull request #32984 from ninjanomnom/thermite-burns 
Fixes thermite burning lava
 2017-11-24 14:10:26 -06:00
ShizCalev
2762e3b530 Fixes Lord Singuloth hungering for more than he should 2017-11-24 13:00:42 -06:00
oranges
c43591982a Refactor on_reagent_change to pass through the change type 2017-11-24 12:59:09 -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
deathride58
c69f933f15 Update uplink_items.dm 2017-11-22 17:55:49 -05:00
oranges
c2c22d56c7 [READY]NTnet refactor, assimilates exonet 2017-11-22 15:52:54 -06:00