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

2111 Commits

Author SHA1 Message Date
LetterJay
16eefdd1e6 Merge pull request #7264 from Citadel-Station-13/upstream-merge-38646 
[MIRROR] [Ready]Expands the list of borg-wearable hats
 2018-07-01 09:32:08 -05:00
LetterJay
74730261b0 Merge pull request #7258 from Citadel-Station-13/upstream-merge-38689 
[MIRROR] Move throwforce up to atom/movable
 2018-07-01 09:30:09 -05:00
LetterJay
de6ae20f87 Merge pull request #7254 from Citadel-Station-13/upstream-merge-38644 
[MIRROR] Port AI static to vis_contents
 2018-07-01 09:29:10 -05:00
LetterJay
fb64d5ce71 Merge pull request #7247 from Citadel-Station-13/upstream-merge-38672 
[MIRROR] Fix the MOTD having too many newlines
 2018-07-01 09:26:04 -05:00
LetterJay
605f7a1bf6 Merge pull request #7240 from Citadel-Station-13/upstream-merge-38675 
[MIRROR] Fixed cyborgs not getting their names at round start
 2018-07-01 09:24:46 -05:00
zxaber
673ad79a32 [Ready]Expands the list of borg-wearable hats (#38646) 
* Adds the ability to deconstruct empty cyborg shells.

* Update robot_parts.dm

* Update robot.dm

* Update robot.dm

* Update robot.dm

* Update robot_defense.dm

* Update _masks.dm

* Update robot_parts.dm

* Update robot_defense.dm

* replaced type with istype

* Reverting masks.dm

* Removing special snowflake bandana check.

* Update robot_defense.dm

* Added Captain's Crown

By player request.
 2018-06-26 15:54:54 -05:00
Tad Hardesty
83a4003660 Move throwforce up to atom/movable (#38689) 2018-06-26 15:27:09 -05:00
Jordan Brown
a14bc0615d Merge pull request #38644 from AutomaticFrenzy/patch/cameranet 
Port AI static to vis_contents
 2018-06-25 20:23:32 -05:00
Jordan Brown
1c41c36489 Merge pull request #38672 from AutomaticFrenzy/patch/goonchat-motd 
Fix the MOTD having too many newlines
 2018-06-25 09:18:27 -05:00
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
CitrusGender
d50ae43d7f Fixed cyborgs not getting their names at round start 2018-06-24 13:55:03 -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
ShizCalev
18bc48c0df Makes swimsuits underwear (#38372) 2018-06-11 00:14:45 -05:00
CitadelStationBot
2a727c6df2 [MIRROR] Removes unused overview code. (#7054) 
* Merge pull request #38361 from AnturK/yeahno

Removes unused overview code.

* Removes unused overview code.
 2018-06-10 12:31:19 -07: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
deathride58
b2d70b2f67 Merge pull request #7039 from Citadel-Station-13/upstream-merge-38279 
[MIRROR] Fix pAI suicide while in holoform deleting the card
 2018-06-09 04:29:30 +00:00
Tad Hardesty
f962a02ef7 Fix meson goggles and lantern wisps conflicting (#38211) 2018-06-07 20:33:50 -05: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
deathride58
a4d1d3d89b Merge pull request #7025 from Citadel-Station-13/upstream-merge-37790 
[MIRROR] Individual Logs now follow the client around automatically
 2018-06-07 04:34:11 +00: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
oranges
de68aa9571 Individual Logs now follow the client around automatically (#37790) 
The logging is now stored in the persistent client/player_details datum,
that will survive an entire round

The existing mob log is retained and a new admin verb is added to access
it. It will only show logs for the mob in question, across all players
who possibly spent time in that mob

A new log type is added that tracks the mobs the player changes across
into and the times they occured, to better help admins manage complex
situations, this also appears in the mob log as a record of the players
who entered/exited control of the mob
 2018-06-06 04:10:20 -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
LetterJay
8bc642c6bd Merge pull request #6992 from Citadel-Station-13/upstream-merge-38220 
[MIRROR] Fixes pocket items being deleted when monkeyizing
 2018-06-03 16:19:36 -05:00