shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,942 Commits 5 Branches 0 Tags
558a989d8a957504ea3fe0e1a5b3f21ba34e8597
Commit Graph

60 Commits

Author SHA1 Message Date
nik707
fd2e9ad5c0 Merge pull request #7753 from Trilbyspaceclone/Trilbyspaceclonepatch-6 
Makes skeletal no longer KPA proof, but Pirate skeletal are still do to being Free or something
 2018-11-23 15:12:19 -06:00
Trilbyspaceclone
f3f314ea6e Yarr 2018-11-20 20:05:31 -05:00
deathride58
402a5ba9e4 Makes it plausible to join as ghost roles from the latejoin menu (#7726) 
* Makes it plausible to join as ghost roles from the latejoin menu

* Clarifies a little bit of the text
 2018-11-16 14:47:42 -08:00
Poojawa
8b9ef1e400 Game folder 2018-09-11 04:06:45 -05:00
deathride58
f1739cb482 Upstream fix mirror spree (#7362) 
* tgstation/tgstation#39025 - Fixes nukeop eshield not being buyable

* tgstation/tgstation#39011 - [s] Adds missing logging to the staff of storms

* tgstation/tgstation#38980 - Corrects a stat error in the Nuke Ops uplink

* tgstation/tgstation#38988 - Fixes blob victory.

* tgstation/tgstation#38990 - Allow players to un-ignore previously ignored popups for ghostroles, and ignore notifications with no ignore button

needs tgui recompile

* tgstation/tgstation#38994 - Fix timer bug

* TGUI recompile

* tgstation/tgstation#39035 - Fixes navigation computers.

* tgstation/tgstation#39043 - Fixes minor genetics scanner runtime

* tgstation/tgstation#39044 - Fixes burgers icons

* tgstation/tgstation#39055 - Fixes porta_turret and decal shuttle rotations

* tgstation/tgstation#39063 - Stops extinguishers from cooling turfs to absolute zero

* tgstation/tgstation#38967 - Fixes smuggler's satchel init typo

* tgstation/tgstation#38931 - Fixes pulse rifles exploding structures in nullspace and that sort of thing
 2018-07-20 03:40:39 -07:00
deathride58
91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
oranges
1d0f775f56 Merge pull request #38360 from ShizCalev/key-cleanup 
Cleans up some logging
 2018-06-11 22:29:27 -05:00
ShizCalev
b5a95e9da8 Makes more messages pronoun sensitive 2018-05-03 17:46:25 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
Poojawa
5fa001c10f things with stuff (#6233) 
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
 2018-04-07 23:07:09 -04:00
Armhulen
fff22d5409 podpeople, wishgranter victims, and clones no longer get 0 as one of their affixes (?) (#36733) 
* yeeeeeeeeeeap

* i turned myself into a commit morty!

* I'M COMMIT RICKKKKKKKK

* tinydwarfy was an inside job

* *reels in pain* you KNOW I DON'T LIKE PISTACHIOS

* WOO
 2018-04-03 22:02:17 -05:00
oranges
9ea4bd45c2 Merge pull request #36432 from ShizCalev/braindamageeventruntime 
Fixes brain damage json runtime
 2018-03-17 07:54:04 -05:00
Jordan Brown
e2b4e3c567 Fixes wrong ID for syndicate ghost roles 2018-02-11 15:35:14 -06:00
CitadelStationBot
9e229691cc Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#5304) 2018-02-05 04:23:09 -06:00
oranges
3a3ff21fbf Merge pull request #34378 from nicbn/yarr 
Pirates are now skeletons
 2018-01-16 14:34:59 -06:00
deathride58
d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
ACCount
435e46e407 Moves some machine sprites into /machines/ folder 2017-12-05 03:24:03 -06:00
oranges
43113cd9b5 Merge pull request #31947 from AnturK/yarr 
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.

If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.

    There's an internal GPS onboard so crew will always be able to follow the shuttle.
    Crew of 3, moderately armed. (Balance pending)
    Shuttle engines have 3 minute cooldown between jumps.
    Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
 2017-11-13 03:19:38 -06:00
AnturK
bd42e162c5 Fixes golem shells breaking spawners menu (#32342) 2017-11-03 17:37:20 -05:00
Mercenaryblue
67a91aaf41 Hotel Security spellchecked (#32313) 
* spellcheck

interests

* spellcheck
 2017-11-02 13:29:15 -05:00
CitadelStationBot
d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165) 
* Grammar fixes to atom descriptions

* compile errors
 2017-10-21 07:17:03 -05:00
vuonojenmustaturska
11a3395690 Tiny batch of Initialize() fixes, mostly stuff that isn't around at roundstart 2017-09-24 17:42:13 -05:00
Poojawa
08d4b2084e Update ghost_role_spawners.dm 2017-09-23 02:32:44 -05:00
Poojawa
391c82e68d Update ghost_role_spawners.dm 2017-09-23 02:23:32 -05:00
Poojawa
28e9bc7d8c added a IC clause to make enforcement easier. 2017-09-23 02:18:02 -05:00
CitadelStationBot
628a2442e2 [MIRROR] Slightly remaps and adds more supplies to the animal hospital ruin (#2705) 
* Merge pull request #30505 from Xhuis/vet_remap

Slightly remaps and adds more supplies to the animal hospital ruin

* Slightly remaps and adds more supplies to the animal hospital ruin
 2017-09-19 06:37:56 -05:00
CitadelStationBot
83ec9b6d26 [MIRROR] Cleans up showcase & plaque varedits, updated loyalty implant references (#2768) 
* Cleans up showcase & plaque varedits, updated loyalty implant references (#30698)

* Cleans up showcase varedits

* drop_location for oldpods

* Plaques + more loyalty implant references

* Cleans up showcase & plaque varedits, updated loyalty implant references
 2017-09-17 23:07:05 -05:00
CitadelStationBot
4dd0dc9d66 [MIRROR] Various grammar fixes (#2842) 
* Various grammar fixes

* Update mecha_parts.dm

* Update crates.dm

* Update ghost_role_spawners.dm

* Update paper_premade.dm

* Update oldstation.dm
 2017-09-17 22:35:51 -05:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
LetterJay
27b826a6f1 Merge pull request #2033 from Citadel-Station-13/upstream-merge-29260 
[MIRROR] Changes all access const to be a define
 2017-07-19 13:18:58 -05:00
CitadelStationBot
bbc28aa856 Energy swords and other transforming energy weapons are now subtypes of transforming weapons (#2049) 2017-07-17 22:51:51 -07:00
CitadelStationBot
609ae007ae Changes all access const to be a define 2017-07-16 11:44:47 -05:00
CitadelStationBot
ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
CitadelStationBot
2da7322cca [MIRROR] Gives ghost roles their own assigned_roles (#1887) 
* Gives ghost roles their own assigned_roles

* Update ghost_role_spawners.dm

* Delete ghost_role_spawners.dm.rej
 2017-07-06 14:15:12 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
CitadelStationBot
d4c54bb0b5 Ancient Space Station [Space Spawn Ruin] 2017-06-25 11:03:27 -05:00
LetterJay
d6d1a26376 Create ghost_role_spawners.dm 2017-06-14 14:28:57 -05:00
LetterJay
df629847bc Create ghost_role_spawners.dm 2017-06-14 13:19:00 -05:00
LetterJay
c877fdb501 Merge branch 'master' into upstream-merge-28046 2017-06-14 13:10:37 -05:00
LetterJay
813bcc2b8d commit 2017-06-14 11:16:54 -05:00
LetterJay
0f966610de Update ghost_role_spawners.dm 2017-06-14 08:25:09 -05:00
CitadelStationBot
e02290bf2b Replaced mob spawner vars with outfits 2017-05-23 07:57:42 -05:00
CitadelStationBot
dc31873c3a fixes being able to transfer into golem shells after they're already taken and sending people into nullspace as a result. 2017-05-22 07:27:43 -05:00
CitadelStationBot
a56d1fcb9b Fix choice for golems transferring between shells 2017-05-19 06:21:10 -05:00
CitadelStationBot
df9e22183d [MIRROR] Servant golems do not have special names (#939) 
* Servant golems do not have special names

* Update golems.dm
 2017-05-18 11:28:09 -05:00
CitadelStationBot
c6a671a11b [MIRROR] Devil refactor+small revamp (#887) 
* Devil refactor+small revamp

* Delete mind.dm.rej

* clean up rej

* Delete admin_investigate.dm.rej

* Delete mapping.dm.rej

* compile fix
 2017-05-18 09:06:01 -05:00
CitadelStationBot
ff9928fdd7 [MIRROR] Makes it clear whether (in)complete golem shells are free or servant (#857) 
* Makes it clear whether (in)complete golem shells are free or servant

* resolves rej file
 2017-05-18 04:40:12 -05:00
CitadelStationBot
ae5897cd82 Ash walkers speak Draconic by default, but still know common (#834) 2017-05-18 01:12:55 -05:00