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

2213 Commits

Author SHA1 Message Date
LetterJay
e6c9911ae2 Merge pull request #2660 from Citadel-Station-13/upstream-merge-30399 
[MIRROR] chainsaws rebalance, but working this time :)
 2017-09-11 18:47:14 -05:00
LetterJay
5c9ba3593a Merge pull request #2678 from Citadel-Station-13/upstream-merge-30482 
[MIRROR] People in soft crit will leave blood trails when dragging themselves/Will take less damage in soft crit
 2017-09-11 18:45:22 -05:00
LetterJay
5c42666355 Merge pull request #2707 from Citadel-Station-13/upstream-merge-30590 
[MIRROR] Fixes Punpun (again)
 2017-09-11 18:45:06 -05:00
LetterJay
b73b6a967a Merge pull request #2680 from Citadel-Station-13/upstream-merge-30519 
[MIRROR] In which smartfridge ui_data is called only when needed, and a minor display bug involving drying racks is fixed
 2017-09-11 18:44:40 -05:00
LetterJay
e5cc2c1e4e Update one_click_antag.dm 2017-09-11 18:28:09 -05:00
LetterJay
c03fb31b1c Update sql_message_system.dm 2017-09-11 18:27:47 -05:00
LetterJay
5fafa90538 Update secrets.dm 2017-09-11 18:27:20 -05:00
LetterJay
584bb8dc64 Update holder2.dm 2017-09-11 18:27:04 -05:00
LetterJay
15c4d34b55 Update create_turf.dm 2017-09-11 18:26:50 -05:00
LetterJay
98f6cf208b Update create_object.dm 2017-09-11 18:26:36 -05:00
LetterJay
bb463cef48 Update create_mob.dm 2017-09-11 18:26:13 -05:00
LetterJay
16c7706618 Merge branch 'master' into upstream-merge-30117 2017-09-11 18:10:15 -05:00
LetterJay
e6cc0673aa Merge branch 'master' into upstream-merge-30399 2017-09-11 18:07:15 -05:00
LetterJay
6cc0ea6af0 Merge pull request #2659 from Citadel-Station-13/upstream-merge-30412 
[MIRROR] Regularizes resisting out of containers
 2017-09-11 18:05:52 -05:00
LetterJay
935ae98f4a Merge branch 'master' into upstream-merge-29839 2017-09-11 18:03:51 -05:00
LetterJay
bfe633540a Update human_movement.dm 2017-09-11 17:55:35 -05:00
LetterJay
6816b83a6d Merge pull request #2673 from Citadel-Station-13/upstream-merge-30509 
[MIRROR] num2text the Instances number
 2017-09-11 17:53:54 -05:00
LetterJay
578846ba4b Merge branch 'master' into upstream-merge-30519 2017-09-11 17:53:13 -05:00
LetterJay
c3a1c08206 Update smartfridge.dm 2017-09-11 17:51:49 -05:00
LetterJay
9adcc174b3 Update shuttle.dm 2017-09-11 17:09:44 -05:00
KorPhaeron
4d2fe460ed Nightmare 2017-09-11 16:23:47 -05:00
LetterJay
01920e5fea Merge pull request #2661 from Citadel-Station-13/upstream-merge-30220 
[MIRROR] Adds Archaeology Component
 2017-09-11 15:22:59 -05:00
LetterJay
1c757deb5b Merge pull request #2650 from Citadel-Station-13/upstream-merge-30420 
[MIRROR] TGUI interfaces to various smartfridges
 2017-09-11 15:22:49 -05:00
LetterJay
6b25a0e42b Merge pull request #2647 from Citadel-Station-13/upstream-merge-30465 
[MIRROR] Fixes shuttle name on ramming.
 2017-09-11 15:22:36 -05:00
LetterJay
c46c442896 Merge pull request #2635 from Citadel-Station-13/upstream-merge-30454 
[MIRROR] Gets rid of manual overlay manipulation
 2017-09-11 15:21:43 -05:00
AnturK
1553e26fe2 I missed that in last fix. (#30590) 2017-09-11 14:37:22 -05:00
LetterJay
726b86f3a4 Update on_move.dm 2017-09-11 14:18:28 -05:00
LetterJay
14aefe2e64 commit 2017-09-11 14:01:42 -05:00
LetterJay
2f10e78ba7 Update on_move.dm 2017-09-11 13:56:28 -05:00
LetterJay
01a5e4bddf Merge pull request #2600 from Citadel-Station-13/Lisp 
disables the lisp that lizard tongues have
 2017-09-11 13:16:15 -05:00
LetterJay
532d8bd0a6 Merge pull request #2558 from Citadel-Station-13/upstream-merge-30268 
[MIRROR] Adds db connectivity check to jobban cache building
 2017-09-11 13:12:38 -05:00
LetterJay
74a163db23 Merge pull request #2553 from Citadel-Station-13/upstream-merge-30252 
[MIRROR] Server tools versioning and fix to displayed testmerges
 2017-09-11 13:12:10 -05:00
LetterJay
6951e39d13 Update apc.dm 2017-09-11 13:10:54 -05:00
LetterJay
c1872907b1 Update robot_modules.dm 2017-09-11 13:10:18 -05:00
LetterJay
ff17626ce7 Update death.dm 2017-09-11 13:09:30 -05:00
BeeSting12
9e83717c92 Spetsnaz Pyro Bundle Rebalance (#30564) 
* im gay

* oops did a thing wrong

* wew
 2017-09-11 12:32:58 -05:00
AnturK
19adbb9a32 Fixes ventriloquist dummy (#30584) 2017-09-11 12:32:49 -05:00
MrROBUST
2812a72cca Mechs now can be connected to atmos ports (#30551) 
* Mechs now can be connected to atmos ports

* Using internal_tank instead of dead code.

* Apply Cyberboss's advises

Corrected stupid typos

* Broke connection if external powers move mech

Remove forgotten comment

* get_turf(src)
 2017-09-11 12:25:33 -05:00
vuonojenmustaturska
053b283745 Fixes initialize hints for a fair number of mobs and items 2017-09-11 12:20:19 -05:00
kevinz000
9b0e43f7c3 Adds a few SDQL2 list wrappers (#30574) 
* Update SDQL_2_wrappers.dm

* Update SDQL_2_wrappers.dm

* Update SDQL_2_wrappers.dm
 2017-09-11 12:19:07 -05:00
kingofkosmos
63122795f9 Adds missing span-endings 2017-09-11 07:10:09 -05:00
CitadelStationBot
8ee6fdb76a [MIRROR] Fixes stop-sounds not force-stopping internet midis (#2692) 
* Fixes stop-sounds not force-stopping internet midis (#30571)

* Update playsound.dm

* Update preferences_toggles.dm (#17)

* Fixes stop-sounds not force-stopping internet midis
 2017-09-10 20:29:12 -07:00
Militaires
3aec72d4f4 Adds Gondoland and the rare Gondolas (#30530) 
A strange race of bear-like beings consisting of a head placed DIRECTLY on a pair of legs, their fur sells for extremely high prices.

The gondoland asteroid is the last natural habitat for these rare creatures.
 2017-09-10 17:10:45 -05:00
ExcessiveUseOfCobblestone
f63a75b137 Egyptian Clothing, Egyptian Null Rod, Craftable Mummy Costume! 2017-09-10 17:08:36 -05:00
LetterJay
b89fa8ab15 Update topic.dm 2017-09-10 15:54:31 -05:00
LetterJay
48a20c94b9 Merge pull request #2688 from Citadel-Station-13/upstream-merge-30382 
[MIRROR] Adds cybernetic lungs(and an upgraded and actually useful variety) to the game.
 2017-09-10 15:53:04 -05:00
LetterJay
0a30d7e962 Merge pull request #2646 from Citadel-Station-13/upstream-merge-30466 
[MIRROR] Fixes drone light toggle while dead
 2017-09-10 15:23:45 -05:00
Firecage
1e0297f9ef Adds cybernetic lungs(and an upgraded and actually useful variety) to the game. (#30382) 
* Adds cybernetic lungs

* Added better cold thresholds to the upgraded cybernetic lungs. Heat threshold remains the same though for balance reasons.

* Adds an EMP effect to cybernetic lungs.
 2017-09-10 14:31:47 -05:00
Leo
cb734046f7 Changes golem shell attackby istype chain to use an assoc list instead of an istype chain (#30542) 
* Changes golem shell attackby istype chain to use an assoc list instead

* Makes the check use merge_type as opposed of item type
 2017-09-10 14:18:25 -05:00
KorPhaeron
134c3f5f39 Losebreath 2017-09-10 12:37:29 -05:00