shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,865 Commits 5 Branches 0 Tags
2d3969882a9db26b3cea9080036f047382e95265
Commit Graph

1768 Commits

Author SHA1 Message Date
LetterJay 2665d0e7a9 Merge branch 'master' into upstream-merge-38661 2018-06-24 18:13:53 -05:00
LetterJay e0eac87b81 Merge pull request #7230 from Citadel-Station-13/upstream-merge-38617 
[MIRROR] Cyborgs now drop radio keys on detonation/destruction
 2018-06-24 16:40:44 -05:00
Jordan Brown 20cb09cb1c Fixes bubblegum comments 2018-06-24 05:17:22 -05:00
kevinz000 4ffe025624 Cyborgs now drop radio keys on detonation/destruction (#38617) 
* Cyborgs now drop radio keys on detonation/destruction

* Woops!

* Update robot.dm

* Use atom rather than turf
 2018-06-24 05:16:18 -05:00
KorPhaeron fa06a729a2 Bubblegum is scarier again (#38306) 
Miners are able to kill him roundstart by just walking backwards while shooting. Weaker than an ash drake.

Easiest way to change this was to give him his original attacks back which required you to avoid/manage blood.
 2018-06-21 18:56:28 -05:00
Jordan Brown 684ceb2125 Merge pull request #38553 from AutomaticFrenzy/patch/aghost-saymode 
Allow admin ghosts to use .p and .d say prefixes
 2018-06-18 13:16:06 -05:00
LetterJay d42c0d42de Merge pull request #7153 from Citadel-Station-13/upstream-merge-38550 
[MIRROR] Fix repairing Cyborg headlamp even when its panel is closed
 2018-06-18 10:13:05 -05:00
Tad Hardesty b5478b6e9d Fix repairing Cyborg headlamp even when its panel is closed (#38550) 2018-06-18 09:35:41 -05:00
81Denton e92060a3a9 Makes the caravan ambush ruin harder to cheese (#38509) 
* makes caravan ambush more challenging

* SMASH
 2018-06-16 15:38:34 -05:00
CitadelStationBot a8b5d744e8 [MIRROR] RESISTCOLD trait now prevents damage and slowdown from cold, instead of preventing cold itself (#7084) 
* RESISTCOLD trait now prevents damage and slowdown from cold, instead of preventing cold itself

* Update life.dm
 2018-06-15 02:47:52 -07:00
CitadelStationBot eafb25535a [MIRROR] Adds a new drink: Peppermint Patty from Archer! (#7094) 
* Adds a new drink: Peppermint Patty from Archer! (#38427)

* Sprites!

*  S_______ W________

* Candyland snuck into pr... Check!

* removal of candyland extract

* candyland but not the sprites yet.

* fixes :)

* Whoops, lets fix that too

* Adds a new drink: Peppermint Patty from Archer!
 2018-06-15 02:46:40 -07:00
CitadelStationBot a3f8e18e26 [MIRROR] Androids are immune to radiation (#7091) 
* Androids are immune to radiation (#38420)

* Androids are immune to radiation
 2018-06-15 02:42:59 -07:00
CitadelStationBot 7ac96e2288 [MIRROR] Equalizes thresholds on being fat (#7095) 
* Equalizes thresholds on being fat (#38383)

* Equalizes thresholds on being fat
 2018-06-13 20:33:19 -07:00
CitadelStationBot 8ec3ac03cd [MIRROR] Fixes drunken scientist R&D point gain. (#7098) 
* Fixes drunken scientist R&D point gain. (#38432)

* Fixes drunken scientist point gain.

* Only R&D points

* Didn't mean to add this newline here.

* Fixes drunken scientist R&D point gain.
 2018-06-13 19:28:35 -07:00
LetterJay 64d5c8cbdc Merge pull request #7073 from Citadel-Station-13/upstream-merge-38381 
[MIRROR] Fix legion cores not healing confusion
 2018-06-12 08:09:20 -05:00
LetterJay 2c0a82ec50 Merge pull request #7070 from Citadel-Station-13/upstream-merge-38378 
[MIRROR] Fix deaf people hearing borg modules going offline
 2018-06-12 08:03:40 -05:00
Jordan Brown 9835bed8d4 Merge pull request #38381 from AutomaticFrenzy/patch/orb-of-confusion 
Fix legion cores not healing confusion
 2018-06-11 22:30:18 -05:00
oranges 69730f0a60 Merge pull request #38378 from AutomaticFrenzy/patch/deaf-borg-mods 
Fix deaf people hearing borg modules going offline
 2018-06-11 22:29:51 -05:00
oranges 1d0f775f56 Merge pull request #38360 from ShizCalev/key-cleanup 
Cleans up some logging
 2018-06-11 22:29:27 -05:00
CitadelStationBot 6510066918 [MIRROR] Logs minor and major crimes (#7053) 
* Merge pull request #38358 from nfreader/record_crimes

Logs minor and major crimes

* Logs minor and major crimes
 2018-06-10 12:29:15 -07:00
deathride58 e279392386 Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128 
[MIRROR] Standardizes and cleans up some admin messages & logging
 2018-06-09 05:53:25 +00:00
deathride58 9963d5a365 Merge pull request #7022 from Citadel-Station-13/upstream-merge-38294 
[MIRROR] Readds hunger slowdown
 2018-06-09 04:45:08 +00:00
deathride58 aae9df5335 Merge pull request #7035 from Citadel-Station-13/upstream-merge-38333 
[MIRROR] Remove mobs from idle NPC pool on Destroy
 2018-06-09 04:41:22 +00:00
deathride58 1fdbd81023 Merge pull request #7037 from Citadel-Station-13/upstream-merge-38320 
[MIRROR] Fixes Lisa's description
 2018-06-09 04:31:20 +00:00
Tad Hardesty 38a3c8549f Fix pAI suicide while in holoform deleting the card (#38279) 2018-06-07 20:06:54 -05:00
Iamgoofball 7e89cb37a6 Fixes Lisa's description (#38320) 2018-06-07 19:54:18 -05:00
Tad Hardesty 458fb9f83d Remove mobs from idle NPC pool on Destroy (#38333) 
* Remove mobs from idle NPC pool on Destroy

* Combine simple_animal Destroy procs
 2018-06-07 17:07:45 -05:00
deathride58 c93213ff25 Update species.dm 2018-06-07 00:35:26 -04:00
81Denton afadb178d2 Adds missing races to mob spawn list (#38314) 
* adds moths to mob species list

* adds missing species
 2018-06-06 17:49:08 -05:00
iksyp 0d6cec9d8c Readds hunger slowdown 2018-06-05 22:35:46 -05:00
deathride58 aab6a78305 Merge pull request #6960 from Citadel-Station-13/upstream-merge-38165 
[MIRROR] Adds config for monkey cap
 2018-06-05 23:38:54 +00:00
deathride58 b3b9a44689 Merge branch 'master' into upstream-merge-38165 2018-06-05 21:53:14 +00:00
deathride58 b49458e0ba Merge branch 'master' into upstream-merge-38116 2018-06-05 21:30:21 +00:00
Tad Hardesty 95bbfb29d1 Fix mecha mouse pointer issues (#38213) 
* Fix mecha mouse pointer issues

* Migrate ranged ability mouse pointers to new system
 2018-06-03 09:03:06 -05:00
LetterJay 5bf3bd761d Merge pull request #6961 from Citadel-Station-13/upstream-merge-38175 
[MIRROR] Removes drone overlays and the associated code
 2018-06-02 07:45:00 -05:00
LetterJay 8d8db8d2fe Merge pull request #6977 from Citadel-Station-13/upstream-merge-38091 
[MIRROR] EMPs no longer pulse internal silicon wires
 2018-06-02 07:32:11 -05:00
LetterJay 97a31c283b Merge pull request #6963 from Citadel-Station-13/upstream-merge-38158 
[MIRROR] Fix: Cyborgs can now use defibs with other modules equipped
 2018-06-02 07:23:42 -05:00
Jordan Brown 5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -05:00
kevinz000 308a8f16b7 EMPs no longer pulse internal silicon wires 2018-06-01 10:19:28 -05:00
Cruix 9c4f4ce17f AI Multicamera mode (#37695) 
* Added multicamera mode for AIs

* Minor multicamera fixes

* Cameras near an AI multicamera eye now light up red

* Disabled AI multicamera mode without admin intervention

* Fixed AIs being able to use multicamera mode when they should not
 2018-05-31 22:41:48 -05:00
CitrusGender f4441c4836 Fix: Cyborgs can now use defibs with other modules equipped (#38158) 
* Adds a check to see if the user is a cyborg before referring to the offhand.

* Update twohanded.dm

* actually this is a bit more modular

* Update twohanded.dm

* Update twohanded.dm
 2018-05-31 22:41:40 -05:00
ShizCalev 4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
vuonojenmustaturska 7b6c75df28 Removes drone overlays and the associated code (#38175) 
* Remove drone overlays

4* animated multidir overlays per mob is a bit much

* to the orbit with you too
 2018-05-31 22:41:21 -05:00
Jordan Brown db20e34d76 Adds config for monkey cap 2018-05-31 22:41:12 -05:00
deathride58 2f9e3e403d Hard upstream sync (#6951) 
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
 2018-05-31 16:03:18 -07:00
CitadelStationBot 270d71d095 [MIRROR] New Trait: Drunken Resilience (#6926) 
* New Trait: Drunken Resilience (#38076)

* drunk healing

* balance, bugfix

* more consistent wording

* removed random chance and tweaked values

* rounding values

* 0 to FALSE, slightly lowered top values

* New Trait: Drunken Resilience
 2018-05-27 17:16:43 -07:00
ShizCalev 69dff942ce Fixes backslot not counting towards assess_threat (#38046) 
* Fixes backslot not counting towards assess_threat

* fixed

* Cleanup & commentary
 2018-05-27 11:41:06 -05:00
LetterJay 3d57f4e360 Merge pull request #6894 from Citadel-Station-13/upstream-merge-38026 
[MIRROR] Fix frost spiders injecting a nonexistent reagent
 2018-05-25 23:03:27 -05:00
Jordan Brown b89dcd7e23 Merge pull request #38026 from AutomaticFrenzy/patch/frostoil 
Fix frost spiders injecting a nonexistent reagent
 2018-05-25 10:48:09 -05:00
vuonojenmustaturska 10327267bb Fixes drones being able to magically sense invisible revenants (#38019) 
* revfix

* Update revenant.dm
 2018-05-25 08:08:57 -05:00