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-11 18:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,357 Commits 55 Branches 0 Tags
ea47d74997658924a6b50676a9f1dbf0cac1852d
Commit Graph

756 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
Jordan Brown
7f997a6a6d Adds feedback for explosions (#33511) 
* Adds feedback for explosions

* Remove stray quote

* Fixes + flash and flame
 2017-12-14 14:00:51 -06:00
Leo
d59fb8c61c Split personality now logs when a ghost gets control of it (#33506) 2017-12-14 06:12:57 -06:00
Jordan Brown
5709d44968 Merge pull request #33487 from deathride58/fixesgenetics 
Fixes genetics mutations disappearing
 2017-12-13 09:14:09 -06: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
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) 
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
 2017-12-11 16:36:38 -08: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
deathride58
0475ef46f7 Merge pull request #4259 from Citadel-Station-13/upstream-merge-33150 
[MIRROR] Makes actionbuttons remember positions where you locked them.
 2017-12-10 23:04:34 +00:00
deathride58
7179547be4 Merge branch 'master' into upstream-merge-31727 2017-12-10 21:51:51 +00:00
LetterJay
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
LetterJay
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
LetterJay
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
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
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
Jordan Brown
8b41dacba9 switches lobes for grammar n shit 2017-12-09 15:53:27 -06:00
XDTM
8502e058b2 Makes godwoken syndrome a bit more reliable 2017-12-09 01:58:18 -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
jammer312
c55b914f06 Makes actionbuttons remember positions where you locked them. 2017-12-08 10:33:54 -06:00
deathride58
3f92e40503 Update sensory.dm 2017-12-06 13:18:45 -05:00
XDTM
988dbe87da Brain Traumas 2017-12-06 12:05:20 -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