shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,974 Commits 5 Branches 0 Tags
754ee3d990ded7dcca6265ae200617f286147ef0
Commit Graph
90 Commits
Author SHA1 Message Date
Ghommie 81b5fe2de3 Further buff and fix for clown ops tearstache nade. 2020-02-03 07:08:47 +01:00
Ghommie 07b6d278a1 fixed and brutalized clown op slippery weapons a little. 2020-02-01 04:48:40 +01:00
kevinz000andGitHub b1cd0f4ede Update grenade.dm 2020-01-19 16:11:49 -07:00
kevinz000andGitHub 90fcedd188 Update grenade.dm 2020-01-19 13:40:09 -07:00
kappa-sama 3e199ed780 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into modularer 2020-01-12 14:23:38 -05:00
AffectedArc07 16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
kappa-samaandGitHub bfedc80c64 idk what this even is lmao 2020-01-10 22:39:45 -05:00
Seris02 29b66db9e3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into explosionport 2020-01-11 11:29:30 +08:00
Seris02 0b0b80f174 explosions 2020-01-11 11:22:59 +08:00
Ghommie 592422ee70 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-05 22:53:00 +01:00
Linzolle d0263fc669 don't act on non mobs 2020-01-03 18:21:08 -06:00
Ghommie e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
kevinz000andGitHub 8aca8b8f25 thank you based ghomtainer (when) 2x how did i not notice this 2019-12-19 04:00:37 -07:00
kevinz000GitHubGhom
 		9436d218b4 thank you based ghomtainer (when) 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-12-19 03:59:57 -07:00
kevinz000andGitHub eee52655ef Update flashbang.dm 2019-12-19 01:57:28 -07:00
Ghommie 9ca7bb759c Ports "Slightly improves visible and audible messages." 2019-12-06 02:02:12 +01:00
Ghommie a52e292cc8 Ports "examine-code refactor"... part 1... 2019-11-19 03:28:06 +01:00
kevinz000andGitHub 5c8471808c Update plastic.dm 2019-09-28 20:44:29 -07:00
Ghommie d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
kevinz000andGitHub 0d43cac0e6 Update grenade.dm 2019-02-22 06:02:55 -08:00
kevinz000andGitHub 12eac8f625 Update grenade.dm 2019-02-18 16:39:43 -08:00
Poojawa d231018a3a Flashy flash and Gondola Pods 
and cult effect addition, fixes CTF
 2018-09-21 02:48:17 -05:00
Poojawa 8b9ef1e400 Game folder 2018-09-11 04:06:45 -05:00
deathride58andkevinz000 695bbef473 makes spears require priming to explode on throw, makes it possible to rip embedded objects out instantly by pressing resist if the item is normal sized or larger (#7450) 2018-08-23 00:30:33 -07:00
deathride58 91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
kevinz000andGitHub b806ee92f3 Merge branch 'master' into upstream-merge-30862 2018-06-17 20:04:06 -07:00
kevinz000andGitHub 6a8f029e30 Update flashbang.dm 2018-06-17 20:02:49 -07:00
ShizCalevandletterjay 4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
deathride58andkevinz000 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
LetterJayandGitHub 6a575f19d1 Merge branch 'master' into upstream-merge-37597 2018-05-22 07:21:53 -05:00
Jordan Brownandletterjay 0d08eca330 Merge pull request #37956 from ShizCalev/chem-grenade-cleanup 
Cleans up duplicate get_area's in c.grenade priming
 2018-05-21 16:35:54 -05:00
LetterJayandGitHub 884b8b8c4d Update smokebomb.dm 2018-05-13 11:54:34 -05:00
deathride58andGitHub 6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
vuonojenmustaturskaandCitadelStationBot 0958d35b26 replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2 2018-05-02 13:14:43 -05:00
kevinz000andPoojawa 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
orangesandCitadelStationBot 7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
Poojawa cc6b320f83 game folder 2018-04-23 00:17:28 -05:00
Poojawaanddeathride58 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
yoriiandCitadelStationBot 130337797d Science goggles detect grenade reagents (#36477) 
* Science goggles detect grenade reagents

* reversed output

* minor improvements

* new helper for counting stuff

* spelling fixes
 2018-03-28 12:18:18 -05:00
deathride58andGitHub 082d36fa6b Merge pull request #5964 from Citadel-Station-13/upstream-merge-36459 
[MIRROR] Clown Ops
 2018-03-17 23:58:15 +00:00
kevinz000andCitadelStationBot f78fea7333 [READY] Refactors wet floors to a component (#36130) 
* Wet Floor components

* No more turf wet slide.
 2018-03-17 07:53:11 -05:00
CruixandCitadelStationBot b4457dfefd Clown Ops 2018-03-17 07:52:41 -05:00
CitadelStationBotandPoojawa c91006c27f [MIRROR] Create ERT refactor (#5924) 
* Create ERT refactor (#36321)

cl Naksu
admin: ERT creation has been refactored to allow for easier customization and deployment via templates and settings
/cl

* Create ERT refactor
 2018-03-12 07:30:03 -05:00
CitadelStationBotandPoojawa 190c964234 [MIRROR] C4 logging now shows correct location (#5748) 
* C4 logging now shows correct location (#36047)

* makes c4 log correct location

* C4 logging now shows correct location
 2018-03-02 18:35:21 -06:00
CitadelStationBotandPoojawa b7015c379a [MIRROR] Cleans up some time stuff with DisplayTimeText (#5685) 
* Cleans up some time stuff with DisplayTimeText

* Update hot_potato.dm
 2018-02-24 07:02:45 -06:00
CitadelStationBotandPoojawa 4d42f68508 [MIRROR] Cleans up chem grenade copypasta'd code (#5675) 
* Merge pull request #35913 from ShizCalev/chem_grenade

Cleans up chem grenade copypasta'd code

* Cleans up chem grenade copypasta'd code
 2018-02-23 19:32:57 -06:00
CitadelStationBotandPoojawa 567c7fad8d [MIRROR] Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#5674) 
* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#35796)

* - Stop subtracting from bodytemp please
- Also fixes shivering

* - Jesus christ why did you make me do this

* - missed one

* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold
 2018-02-23 17:42:57 -06:00
BordListianandCitadelStationBot 24ab7e0a84 Adds rainbow slime clusterbangs (#35707) 
* - slime
- yes

* - Adds a volatile reaction

* - There is no escape from the standards that live within
- Can't wait for the experimentor review
 2018-02-17 00:47:03 -06:00
deathride58 72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
CitadelStationBotandPoojawa 9e229691cc Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#5304) 2018-02-05 04:23:09 -06:00