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

1317 Commits

Author SHA1 Message Date
deathride58
a2fb8b5304 Merge pull request #4765 from Citadel-Station-13/upstream-merge-34117 
[MIRROR] Makes medbots unable to inject you if you are are fully covered with THICKMATERIAL.
 2018-01-12 17:41:44 +00:00
LetterJay
c98be44b33 Merge pull request #4762 from Citadel-Station-13/upstream-merge-33817 
[MIRROR] [READY]Pulling claw 2
 2018-01-11 15:19:11 -06:00
LetterJay
878b16e41a Merge pull request #4757 from Citadel-Station-13/upstream-merge-34177 
[MIRROR] Prevents renaming uniquely named pets.
 2018-01-11 15:16:38 -06:00
oranges
b128c9d3b5 Merge pull request #34117 from ShizCalev/medbot-tweak 
Makes medbots unable to inject you if you are are fully covered with THICKMATERIAL.
 2018-01-11 14:07:28 -06:00
arsserpentarium
1d91243ae2 [READY]Pulling claw 2 (#33817) 
Pulling claw is integrated circuit,which allows drones to pull things.
 2018-01-11 14:03:52 -06:00
Leo
5cb74c909c Merge pull request #34177 from ShizCalev/pet-rename 
Prevents renaming uniquely named pets.
 2018-01-11 07:40:33 -06:00
Leo
bc7b34d369 Merge pull request #34168 from ShizCalev/dna-human-runtime 
Corrects runtime when shooting humans
 2018-01-11 07:40:26 -06:00
deathride58
ff83b6451b Merge pull request #4727 from Citadel-Station-13/upstream-merge-34065 
[MIRROR] Fixes reflections
 2018-01-10 20:21:56 +00:00
deathride58
54c87fdd15 Merge pull request #4738 from Citadel-Station-13/upstream-merge-34111 
[MIRROR] Fixes buckled message spam for ghosts inside talking scythes
 2018-01-10 19:58:18 +00:00
deathride58
14d0857109 Merge pull request #4733 from Citadel-Station-13/upstream-merge-34187 
[MIRROR] Switches butchering/gib drops to use drop_location
 2018-01-10 19:56:54 +00:00
deathride58
d0e170d9f9 Merge pull request #4731 from Citadel-Station-13/upstream-merge-34169 
[MIRROR] Fixes fully_heal not curing disabilities
 2018-01-10 19:56:13 +00:00
ShizCalev
594de23c1f Fixes buckled message spam for ghosts inside talking scythes (#34111) 
* Fixes buckled message spam for ghosts

* params
 2018-01-10 03:48:10 -06:00
Leo
88fa0ea83f Merge pull request #34195 from tgstation/Cyberboss-patch-1 
Fixes weakref runtimes
 2018-01-10 03:12:46 -06:00
Leo
5cc7492f0a Merge pull request #34187 from ShizCalev/butcher-droplocation 
Switches butchering/gib drops to use drop_location
 2018-01-10 03:12:39 -06:00
Leo
377ea0f68c Merge pull request #34169 from ShizCalev/heal-fix 
Fixes fully_heal not curing disabilities
 2018-01-10 03:12:23 -06:00
Robustin
34919f7bce Fixes reflections 2018-01-10 03:11:48 -06:00
deathride58
78df6facb6 fixes flavortext readmores for real this time 2018-01-09 22:59:22 -05:00
AnturK
f6ef771ccd Fixes teleport camera (#34113) 2018-01-08 22:09:14 -06:00
deathride58
6957a6f13f Merge branch 'master' into upstream-merge-34105 2018-01-08 20:03:41 +00:00
deathride58
e4410a3320 Merge branch 'master' into mapsyncs43293845982 2018-01-08 06:18:11 +00:00
oranges
1e9598dfbd Clean up a bunch of undefined arg runtimes 2018-01-07 20:53:12 -06:00
Iamgoofball
99b299a1eb Implements the Ballmer Peak: Now the bartender can help R&D! (#33979) 
* Implements the Ballmer Peak: Now the bartender can help R&D!

* fugg

* lmao forgot to multiply that

* unzips math

* asdaafffff

* buffs windows ME

* Adds notifications about the peak.
 2018-01-07 20:30:57 -06:00
deathride58
85aa297923 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:30:41 +00:00
deathride58
3e937fcecf Merges #4679 , #4670 , and #4677 2018-01-07 15:29:42 -05:00
deathride58
dd5dc57043 Update blood.dm 2018-01-07 15:20:11 -05:00
ShizCalev
7956e3df27 Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp 2018-01-07 11:02:49 -06:00
deathride58
1e1f83d945 fixes compiling errors and string regressions 2018-01-04 10:24:57 -05:00
deathride58
8f593f0d00 living carbon 2018-01-04 01:36:28 -05:00
deathride58
273b38a765 mob living simple_animal 2018-01-04 01:23:37 -05:00
deathride58
66f0a9c2b7 mob living silicon 2018-01-04 01:06:25 -05:00
deathride58
4957aa3cb0 mob living - root 2018-01-04 01:03:39 -05:00
deathride58
6dc4584401 Merge pull request #4643 from Citadel-Station-13/upstream-merge-34033 
[MIRROR] Fix mimes being able to laugh audibly
 2018-01-03 18:54:12 +00:00
Leo
c1623792c9 Merge pull request #34033 from AutomaticFrenzy/patch/mime-laugh 
Fix mimes being able to laugh audibly
 2018-01-03 07:36:43 -06:00
ShizCalev
c41bf82380 Fixes observers not being transfered to new mobs (#34039) 2018-01-03 07:33:53 -06:00
LetterJay
d035f16aca Update basilisk.dm 2018-01-02 05:24:47 -06:00
LetterJay
f2f6d9d910 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 
# Conflicts:
#	code/modules/events/alien_infestation.dm
#	code/modules/events/spider_infestation.dm
#	code/modules/events/vent_clog.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
 2018-01-02 05:16:13 -06:00
LetterJay
b49009d481 Merge pull request #4454 from Citadel-Station-13/upstream-merge-33621 
[MIRROR] removes silly garbage defines
 2018-01-02 04:52:57 -06:00
LetterJay
9ede14fbce Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33574 2018-01-01 14:14:06 -06:00
LetterJay
30d4b25aee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 2018-01-01 14:09:07 -06:00
LetterJay
168519c328 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32311 2018-01-01 07:00:34 -06:00
oranges
3208404f14 Merge pull request #33580 from Xhuis/defenses_balancing 
Some modest clockcult balancing - vitality matrices, brass skewers, pressure sensors
 2017-12-30 16:59:07 -06:00
LetterJay
32291c247b Update megafauna.dm 2017-12-30 13:33:45 -06:00
LetterJay
2994b4b7c2 Update blood_drunk_miner.dm 2017-12-30 13:33:37 -06:00
LetterJay
449ae34621 Update hostile.dm 2017-12-30 13:33:25 -06:00
LetterJay
c8f3fdfe38 Merge branch 'master' into upstream-merge-33663 2017-12-30 13:29:36 -06:00
LetterJay
dae3c3efb5 Merge branch 'master' into upstream-merge-33621 2017-12-30 13:23:39 -06:00
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
LetterJay
72d0ca2f1a Merge pull request #4590 from Citadel-Station-13/upstream-merge-33796 
[MIRROR] Monkeymode fixes
 2017-12-30 05:05:20 -06:00
LetterJay
de0ade801c Merge pull request #4589 from Citadel-Station-13/upstream-merge-33903 
[MIRROR] Fixes mobs targeting from inside things.
 2017-12-30 05:04:09 -06:00
LetterJay
4599680f68 Merge pull request #4580 from Citadel-Station-13/upstream-merge-33842 
[MIRROR] Internal radio implant
 2017-12-30 05:03:48 -06:00