shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,538 Commits 5 Branches 0 Tags
6e5131cfc59cfee2dbc4274283770bec3157d55f
Commit Graph

60 Commits

Author SHA1 Message Date
CitadelStationBot
30a4705c01 [MIRROR] Clean up all sorts of crap, mostly defines (#5788) 
* Clean up all sorts of crap, mostly defines

* fixes compile errors
 2018-03-05 13:23:28 -06:00
CitadelStationBot
3b07fc6717 [MIRROR] Ninja event 'fun' change. (#5650) 
* Ninja event 'fun' change. (#35859)

* Lower 1 hour events to 40mins

* Revert change to Slaughter demon

Waaaaaaaaa

* Revert "Revert change to Slaughter demon"

This reverts commit 92e187338367952ea00ef05b9d2f17d8ff6fb12c.

* Truly revert Slaughter Demon change

Waaaaaa

* Ninja event 'fun' change.
 2018-02-22 01:30:52 -06:00
81Denton
cfd768e09f Changes event earliest_start to use time helpers (#35841) 
* uses time helpers, tweaks santa/shuttle loan times

* hourS
 2018-02-21 11:38:26 -06:00
deathride58
fb65a98117 Merge pull request #5516 from Citadel-Station-13/upstream-merge-35668 
[MIRROR] Quote the armor lists
 2018-02-17 19:29:50 +00:00
MetroidLover
55f9129141 Space Ninja smoke bomb refill (#35689) 
* Ninja Smoke Bomb refill

Adds Ninja smoke bomb refill ability.

* Change a spaghetti flaw.

* I fluffed the indentation again. :P
 2018-02-16 10:39:13 -06:00
Jordan Brown
f9353da855 Quote the armor lists 2018-02-16 00:26:26 -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
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178) 
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
 2018-01-29 04:42:29 -06:00
AnturK
3dc89ba058 Antag Panel / Check antagonists Refactor 2018-01-19 08:43:49 -06:00
deathride58
aabbbb9dff aaaand the rest of the modules folder 2018-01-04 01:45:38 -05:00
oranges
269208f687 [READY]Component Forensics and Item Blood OverlayS! 2017-12-27 15:19:14 -06:00
LetterJay
92c347d068 Merge branch 'master' into upstream-merge-33246 2017-12-20 00:27:06 -06: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
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) 
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
 2017-12-11 16:36:38 -08:00
AnturK
6bfca33a78 Roundend report refactor 2017-12-11 10:58:23 -06:00
oranges
4204c889ed Merge pull request #32964 from AutomaticFrenzy/patch/joules 
Measure energy values in joules
 2017-12-05 03:23:06 -06:00
Jordan Brown
2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
ShizCalev
c2000cc31a Fixes inconsistencies w/ energy descriptions 2017-11-18 14:18:14 -06:00
YPO
5d44770e8c Fixes energy katana dash toggle 2017-11-04 19:39:48 -05:00
kevinz000
b20e5916ea Removes a bunch of sleeps/spawns and makes a few booleans defines 2017-10-14 18:53:48 -05:00
Tad Hardesty
01ecdff51a Improve extended examination text for many objects (#31381) 
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
 2017-10-10 03:07:38 -05:00
LetterJay
f9cd7aa5b3 Merge branch 'master' into upstream-merge-31289 2017-10-05 06:15:44 -04:00
LetterJay
4c38a8b1e2 Update energy_katana.dm 2017-10-04 20:51:37 -05:00
LetterJay
365adf852c Merge branch 'master' into upstream-merge-31222 2017-10-04 21:50:07 -04:00
Leo
e5f5b427ba Makes the energy katana swwwwwwish when drawn 2017-10-04 19:25:21 -05:00
ShizCalev
4d23dd56b8 Sets KEEP_TOGETHER appearance_flag for humans, energy draining text updated to DisplayPower (#31150) 
* Hides ninja socks, draining updated to DisplayPower

* CB

* KEEP_TOGETHER
 2017-10-04 16:29:30 -05:00
KorPhaeron
4e648765db Ports dash weapons to the dash datum 2017-10-03 18:11:42 -05:00
ShizCalev
2635689e79 Cleans up some antag/event landmark checks 2017-09-30 21:33:13 -05:00
oranges
a01540e39b Merge pull request #31074 from pubby/ninjaoutfit 
Ninja outfit code cleanup
 2017-09-28 21:53:05 -05:00
CitadelStationBot
d2db21dbdf [MIRROR] Ninja adrenaline boost removes stamina damage (#2783) 
* Merge pull request #30704 from YPOQ/boost

Ninja adrenaline boost removes stamina damage

* Ninja adrenaline boost removes stamina damage
 2017-09-16 04:46:41 -05:00
kingofkosmos
63122795f9 Adds missing span-endings 2017-09-11 07:10:09 -05:00
LetterJay
a6aa71e0b9 commit 2017-09-01 09:52:29 -05:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
kevinz000
35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458) 
lets hope nothing blows up this time (Flags PR but it works!)
 2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457) 
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
 2017-08-22 04:04:21 -07:00
LetterJay
a0cf777040 Merge branch 'master' into upstream-merge-29940 2017-08-21 23:29:24 -05:00
CitadelStationBot
b5e7f7f7fe [MIRROR] Adds defines for mouse_opacity (#2381) 
* Adds defines for mouse_opacity

* Delete misc.dm.rej

* Update misc.dm
 2017-08-21 20:29:37 -07:00
CitadelStationBot
87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
CitadelStationBot
3d83b55cf6 Annihilates the colons! 2017-08-15 10:49:55 -05:00
CitadelStationBot
dd22c79678 Completes major inhand split project (#2178) 2017-08-02 06:30:33 -05:00
CitadelStationBot
a72962c300 Made some object lists less terrible to read 2017-07-18 09:44:43 -05:00
CitadelStationBot
d21766956e [MIRROR] Cleaned up some emag_acts (#2018) 
* Cleaned up some emag_acts

* Delete port_gen.dm.rej

* Update port_gen.dm
 2017-07-15 13:17:56 -07:00
CitadelStationBot
ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
CitadelStationBot
90c2a4f867 Removes now-unnecessary obj_integrity definitions 2017-07-09 19:44:48 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
CitadelStationBot
6f67132f27 Fixes ninjas not getting their katana (#1831) 2017-06-29 18:59:13 -07:00
CitadelStationBot
5cf2065432 Ninja Dash 2017-06-26 08:57:46 -05:00
LetterJay
b80a184d97 up to upstream-merge-27868 2017-06-11 00:04:00 -05:00
Poojawa
909be8c8c7 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27344 2017-05-21 01:10:53 -05:00