shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,553 Commits 5 Branches 0 Tags
4d08f9b0bc364c7cd4b10063c1272b3e63089199
Commit Graph
772 Commits
Author SHA1 Message Date
deathride58andGitHub b2187123fb Merge pull request #4420 from Citadel-Station-13/upstream-merge-33405 
[MIRROR] [Ready]Brain Trauma additions
 2017-12-21 03:42:38 +00:00
deathride58andGitHub 0be7ea0755 Merge pull request #4451 from Citadel-Station-13/upstream-merge-33599 
[MIRROR] Callback security and usr
 2017-12-21 03:29:13 +00:00
deathride58andGitHub 2de3b12364 Merge pull request #4464 from Citadel-Station-13/upstream-merge-33594 
[MIRROR] Adds knock off component
 2017-12-21 03:25:41 +00:00
Jordan BrownandCitadelStationBot 25d5e5b6b4 Merge pull request #33594 from AnturK/knockoff 
Adds knock off component
 2017-12-20 00:14:36 -06:00
LetterJayandGitHub d6a5ee596b Update mind.dm 2017-12-19 23:55:36 -06:00
LetterJay 7dec65ff85 fuck 2017-12-19 20:20:09 -06:00
LetterJayandGitHub 36ad355f9d Update mind.dm 2017-12-19 20:08:49 -06:00
LetterJayandGitHub a8e36670e2 Update mind.dm 2017-12-19 20:02:03 -06:00
LetterJayandGitHub 614e93b975 Update mind.dm 2017-12-19 19:26:28 -06:00
LetterJayandGitHub 408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
Jordan BrownandCitadelStationBot fabfad270f Callback security and usr (#33599) 
* Gonna regret writing this one day

* tmp -> temp

* Make PushUsr() a /world proc

* Callbacks now preserve usr

* Fixes PushUsr return value

* Fixes PushUsr invocations

* Update modifyvariables.dm

* Use weakrefs in callback user

* Further fixes

* Whoopsie
 2017-12-18 21:41:33 -06:00
kevinz000andCitadelStationBot 8149f52777 Adds jousting (#33531) 2017-12-18 20:54:21 -06:00
XDTMandCitadelStationBot 6b4099805f [Ready] Adds abductor Mind Interface Devices, and a gland HUD (#33209) 
* Adds abductor Mind Interface Devices, and a gland HUD

* .
 2017-12-18 20:29:37 -06:00
LeoandCitadelStationBot 2578484644 Merge pull request #33613 from Armhulen/patch-32 
deep fryers are quieter now...
 2017-12-17 20:22:00 -06:00
XDTMandCitadelStationBot 962f135957 [Ready]Brain Trauma additions 2017-12-17 11:11:10 -06:00
Emmett GainesandCitadelStationBot f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
LetterJayandGitHub 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 BrownandCitadelStationBot 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
LeoandCitadelStationBot d59fb8c61c Split personality now logs when a ghost gets control of it (#33506) 2017-12-14 06:12:57 -06:00
Jordan BrownandCitadelStationBot 5709d44968 Merge pull request #33487 from deathride58/fixesgenetics 
Fixes genetics mutations disappearing
 2017-12-13 09:14:09 -06:00
LeoandCitadelStationBot 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
CitadelStationBotandkevinz000 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 7179547be4 Merge branch 'master' into upstream-merge-31727 2017-12-10 21:51:51 +00:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
orangesandCitadelStationBot d88bff9fa9 Restores the uplink modules, removes LoadComponents 2017-12-10 14:14:37 -06:00
coiaxandCitadelStationBot 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 BrownandCitadelStationBot 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 BrownandCitadelStationBot 8b41dacba9 switches lobes for grammar n shit 2017-12-09 15:53:27 -06:00
XDTMandCitadelStationBot 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
deathride58andGitHub 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
deathride58andGitHub 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 BrownandCitadelStationBot dfaa796fc2 Fixes certain material containers 2017-12-08 12:11:46 -06:00
Jordan BrownandCitadelStationBot 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
YPOQandCitadelStationBot f7d5ab5baf Fixes some broken random events (#33345) 2017-12-08 10:34:50 -06:00
jammer312andCitadelStationBot c55b914f06 Makes actionbuttons remember positions where you locked them. 2017-12-08 10:33:54 -06:00
deathride58andGitHub 3f92e40503 Update sensory.dm 2017-12-06 13:18:45 -05:00
XDTMandCitadelStationBot 988dbe87da Brain Traumas 2017-12-06 12:05:20 -06:00
deathride58andGitHub 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 BrownandCitadelStationBot 76746cd57a Minor component optimizations (#33269) 
* Minor component optimizations

* Second argument of list.Copy is optional
 2017-12-05 15:52:19 -06:00
Jordan BrownandCitadelStationBot e1f658a50d Removes ComponentActivated in favor of callbacks 2017-12-05 15:42:47 -06:00
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub fec2c32ec7 Merge pull request #4224 from Citadel-Station-13/upstream-merge-33237 
[MIRROR] Fixes robeless apprentice
 2017-12-05 20:13:38 +00:00
MoreRobustThanYouandCitadelStationBot d5cf1b3fec [s] Fix changeling chat (#33305) 
* Fix changeling chat

* Update say.dm
 2017-12-05 13:43:03 -06:00