shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
48,445 Commits 5 Branches 0 Tags
master
Commit Graph
909 Commits
Author SHA1 Message Date
BlackMajor f68962e9d3 This is a bad idea 2020-07-18 16:46:08 +12:00
timothyteakettle 7714fcfaba more changes 2020-07-18 01:26:38 +01:00
siliconsandGitHub 655afda020 Merge pull request #12780 from BlackMajor/borgo 
Even more engiborg power creep
 2020-07-17 17:08:23 -07:00
BlackMajor fc909cd7c6 Added material sheets and tiles. This took more work than you'd think. 2020-07-17 01:17:54 +12:00
BlackMajor bd7c9d11d3 oh no 2020-07-16 02:02:29 +12:00
Artur 5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
Strazyplus 15470de825 Don't DragON me, mister! 
Removes comments from code
Removes mentions of Navier
Why are we still here? Just to suffer?
 2020-07-13 07:01:48 -04:00
Strazyplus 92a6d673ba Drakes are dragons too 2020-07-12 07:32:09 -04:00
Strazyplus 2eb353d195 More License detail tweaks. 2020-07-12 00:56:43 -04:00
Strazyplus 582be67063 Lawyer-drake when? 
unmodularized drakeborg
added licencing documentation
reduced / simpified code comments
 2020-07-12 00:42:46 -04:00
Strazyplus 47921b2ae6 Removed unused sleeper_override 2020-07-11 23:16:42 -04:00
Strazyplus c9cb29ceea Who feeding the chunkydrakes 2020-07-11 22:57:37 -04:00
Strazyplus 13fe156a8b Dragon online! 2020-07-11 21:32:34 -04:00
Putnam a625d6562b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-07-08 22:02:03 -07:00
Artur 280d3de6c3 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-07 18:37:45 +03:00
Ghommie f5ffd7d2a9 Easing fine tuning of the system. 2020-07-03 03:00:33 +02:00
Artur 6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
Artur 20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03:00
Ghommie 9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
Ghommie c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
Ghommie de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
Artur c41d2e78be Conflicts!!! 2020-06-22 17:39:24 +03:00
LinandGitHub 2cd18f3dba Merge pull request #12557 from silicons/life 
Splits Life() into procs for physical and biological life processes in preparation for stasis beds
 2020-06-21 18:32:58 -05:00
Ghommie 29a8d2ed78 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit813 2020-06-20 00:07:47 +02:00
kevinz000 78fadafa05 alright 2020-06-17 21:44:49 -07:00
kevinz000 1336404eb6 last ones 2020-06-17 21:37:19 -07:00
kevinz000 445d94f335 haha whew 2020-06-17 21:32:10 -07:00
Artur ceba739231 Cooonflicts 2020-06-16 01:23:42 +03:00
LinandGitHub 923cb248d2 Merge pull request #12515 from kevinz000/roomba 
Zoombas
 2020-06-14 14:36:03 -05:00
kevinz000 86a07fffc3 line fix 2020-06-12 15:34:40 -07:00
kevinz000 f9c624ef80 based vorestation 2020-06-12 15:32:32 -07:00
LinandGitHub bfe8ccdfb5 Merge pull request #11627 from kevinz000/combat_rework 
"Unofficial" Combat Rework Part 3: Blocking/Parrying
 2020-06-12 16:39:11 -05:00
deathride58andGitHub 245bf750c7 fixes a pair of dos vectors. this is apparently a day -1 patch! (#12511) 2020-06-12 11:54:18 -07:00
Artur b6dc41b852 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-09 11:07:39 +03:00
DeltaFire15andGitHub efddaa8cad removes early return (#12483) 
This early return, while skipping a few things, is a bad ideaas this pretty much allowed silicons to still interact with the station off-z as it 'skipped' the check for it.
 2020-06-08 09:10:06 -07:00
Ghommie ad6b835e8b Linter. 2020-06-08 08:12:29 +02:00
kevinz000 bad809ffce fixes 2020-06-04 19:56:06 -07:00
TrilbyspacecloneandGitHub 0b0e9011a7 Prevent surgery tools and items from being rad contaminatable (#12413) 
* Update tools.dm

* Update tools.dm

* Update robot_modules.dm
 2020-06-04 15:56:15 -07:00
Yawet330andGitHub fabfd684ce Silicon Flavortexts. (SCRUTINISE HEAVILY) (#12395) 
* Part 1 - Adding the component

* Part 2 - Making the WRITE_FILE before changing the pref menu.

* Part 3 - Mirroring existing code, instead of tacking it on because im both lazy, and want a distinction

* Part 4 - Changes the preference tab to accomodate this.

* we made a brief fucky wucky!

* make it look noice

* fuckywucky mk2

* Part 5 - make it apart of the helper list (woops)

* that'yll do it.

* maybe fix?

* nope, just hit the delete button on their flavortext entirely :agony:

* Update preferences_savefile.dm

* Update silicon.dm

* Update preferences.dm

* Update silicon.dm
 2020-06-04 15:53:39 -07:00
Artur 19f215477e Merge remote-tracking branch 'upstream/master' into TGUI-3.0 2020-05-30 18:52:02 +03:00
kevinz000 05fe0c7dcc ok 2020-05-30 00:59:29 -07:00
kevinz000 65bb3bbb91 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-29 19:13:22 -07:00
kevinz000 92a537da63 Damage fix 2020-05-29 19:12:46 -07:00
Ghommie 1bca74465f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-30 03:29:02 +02:00
GhomandGitHub 668205c149 Unstucks robot mobs from permanent sprint mode. (#12389) 2020-05-29 14:56:19 -07:00
kevinz000 433bd1af79 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-27 18:11:15 -07:00
GhomandGitHub 968426fd48 Combat mode component. (#12338) 
* Combat mode component.

* Whoops.

* test.

* Oh

* refs begone, and documentation.
 2020-05-27 18:00:32 -07:00
kevinz000 e4eb49050c Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-24 15:03:06 -07:00
kevinz000 95c6c7345c implementations 2020-05-24 14:56:01 -07:00
GhomandGitHub ce1f1bdf5e Turning a few components into elements. (#12325) 
* Turning a few components into elements.

* eh
 2020-05-24 13:06:27 -07:00