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

814 Commits

Author SHA1 Message Date
LetterJay
b260704381 Merge pull request #4530 from Citadel-Station-13/upstream-merge-33705 
[MIRROR] Turns the baseturf var into a part time list
 2017-12-30 13:19:00 -06:00
MoreRobustThanYou
459d4f35c7 Monkeymode fixes (#33796) 
* Monkey fixes

* Update say.dm
 2017-12-29 10:08:17 -06:00
LetterJay
a64a1e4a5c Merge branch 'master' into upstream-merge-33783 2017-12-29 06:49:47 -06:00
LetterJay
b8370a7786 Merge pull request #4582 from Citadel-Station-13/upstream-merge-33882 
[MIRROR] Spell action buttons finally fixed
 2017-12-29 06:25:54 -06:00
LetterJay
c7db4e8310 also syncs a bunch of shit 2017-12-29 04:12:43 -06:00
Robustin
d7723a064c Spell action buttons finally fixed (#33882) 
* Action button fix

* Action button fix

* Spell action button fix

* Spell action button fix

* Update alien_powers.dm

* Update spell.dm

* Action button fix

* Update touch_attacks.dm
 2017-12-29 02:54:50 -06:00
LetterJay
518b264654 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783 
# Conflicts:
#	_maps/map_files/generic/CentCom.dmm
#	code/modules/mob/living/living.dm
 2017-12-29 01:34:17 -06:00
oranges
4e1770a21f Fixes admin fingerprintslast 2017-12-29 00:28:55 -06:00
deathride58
0f3e69a420 Merge pull request #4538 from Citadel-Station-13/upstream-merge-33820 
[MIRROR] Material containers only insert on help intent
 2017-12-28 02:52:45 +00:00
LetterJay
0381491643 oops 2017-12-27 07:08:26 -06:00
LetterJay
2e6b034493 save point - a lot of shit to fix 2017-12-27 07:03:40 -06:00
CitadelStationBot
9aa77b7df1 [MIRROR] Rebalances virus healing (#4543) 
* Rebalances virus healing (#33815)

* Rebalances virus healing

* carbon

* Rebalances virus healing
 2017-12-26 13:58:02 -08:00
Leo
2da318a9a5 Merge pull request #33820 from tgstation/Cyberboss-patch-4 
Material containers only insert on help intent
 2017-12-26 09:25:14 -06:00
LetterJay
290c1e0868 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32916 2017-12-26 08:24:20 -06:00
LetterJay
358c625ed3 Merge pull request #4503 from Citadel-Station-13/upstream-merge-33590 
[MIRROR] [READY]Clownborgs - ADMIN SPAWN ONLY
 2017-12-26 05:59:52 -06:00
LetterJay
4b79ee5e94 Merge pull request #4527 from Citadel-Station-13/upstream-merge-33736 
[MIRROR] Ghosts can *spin and *flip
 2017-12-25 22:25:54 -06:00
LetterJay
5dd7136225 Merge branch 'master' into upstream-merge-33590 2017-12-25 21:29:18 -06:00
LetterJay
134201d185 Merge pull request #4494 from Citadel-Station-13/upstream-merge-32433 
[MIRROR] [READY]Refactors projectile trajectories, fixes piercing projectile inaccuracy and beam rifle visual deflections
 2017-12-25 21:26:17 -06:00
Emmett Gaines
9d0a4722e5 turns the baseturf var into a part time list (#33705) 2017-12-25 19:11:06 -06:00
coiax
703667bdff Ghosts can *spin and *flip 2017-12-25 17:11:29 -06:00
LetterJay
ac5503d338 Merge branch 'master' into upstream-merge-33055 2017-12-25 04:10:34 -06:00
LetterJay
06354b97d9 Merge pull request #4517 from Citadel-Station-13/upstream-merge-33792 
[MIRROR] gbs now grants a sense of pride and accomplishment instead of 40 hours of toxin damage.
 2017-12-24 17:00:30 -06:00
LetterJay
0f86dd3f72 Merge pull request #4515 from Citadel-Station-13/upstream-merge-33306 
[MIRROR] Replaces CLEAN_ON_MOVE_1 flag with cleaning component
 2017-12-24 17:00:06 -06:00
Jordan Brown
164db7ae9b Prefixed all disability defines with DISABILITY_ to fix a name collision 2017-12-24 15:03:30 -06:00
Armhulen
d9f3c74607 pride and satisfaction 2017-12-24 15:03:07 -06:00
Jordan Brown
af1f13e114 Merge pull request #33306 from coiax/replace-clean-flag-with-component 
Replaces CLEAN_ON_MOVE_1 flag with cleaning component
 2017-12-23 08:36:37 -06:00
kevinz000
bec20087c2 [READY]Clownborgs - ADMIN SPAWN ONLY 2017-12-22 10:58:13 -06:00
Jordan Brown
f20622cc54 Adds round ID to Show Server Revision (#33723) 2017-12-22 10:43:37 -06:00
oranges
a89435ac33 Merge pull request #32433 from kevinz000/vector_projectiles 
[READY]Refactors projectile trajectories, fixes piercing projectile inaccuracy and beam rifle visual deflections
 2017-12-21 19:33:42 -06:00
LetterJay
8750d93126 Merge branch 'master' into upstream-merge-33614 2017-12-21 05:02:21 -06:00
LetterJay
74232f6373 Merge pull request #4480 from Citadel-Station-13/upstream-merge-33550 
[MIRROR] Adds instanceless component dupe mode
 2017-12-21 04:58:20 -06:00
LetterJay
56ecc13289 Merge pull request #4325 from Citadel-Station-13/upstream-merge-33246 
[MIRROR] Roundend report refactor
 2017-12-21 03:22:31 -06:00
Jordan Brown
09c802f984 Merge pull request #33550 from ninjanomnom/instanceless-component-dupe 
Adds instanceless component dupe mode
 2017-12-21 00:51:02 -06:00
deathride58
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
deathride58
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
deathride58
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
LetterJay
00d3b8f1b7 a lot of shit synced in this one commit. 2017-12-20 02:53:51 -06:00
LetterJay
92c347d068 Merge branch 'master' into upstream-merge-33246 2017-12-20 00:27:06 -06:00
LetterJay
5f69eac050 Update mind.dm 2017-12-20 00:19:39 -06:00
Jordan Brown
25d5e5b6b4 Merge pull request #33594 from AnturK/knockoff 
Adds knock off component
 2017-12-20 00:14:36 -06:00
LetterJay
d6a5ee596b Update mind.dm 2017-12-19 23:55:36 -06:00
LetterJay
7dec65ff85 fuck 2017-12-19 20:20:09 -06:00
LetterJay
36ad355f9d Update mind.dm 2017-12-19 20:08:49 -06:00
LetterJay
a8e36670e2 Update mind.dm 2017-12-19 20:02:03 -06:00
LetterJay
614e93b975 Update mind.dm 2017-12-19 19:26:28 -06:00
LetterJay
408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
Jordan Brown
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
kevinz000
8149f52777 Adds jousting (#33531) 2017-12-18 20:54:21 -06:00
XDTM
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
LetterJay
b1669b8179 Update severe.dm 2017-12-18 17:24:16 -06:00