shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,944 Commits 5 Branches 0 Tags
c919075aca0cabc02ec33bc5cfbb64221463079c
Commit Graph

694 Commits

Author SHA1 Message Date
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
silicons
39b58f0057 Merge pull request #12581 from Detective-Google/shunties 
prevents shunted AIs from doomsdaying (tg#51284)
 2020-06-24 08:44:48 -07: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
Detective Google
099f594a30 SMESes should now work with self-charging cells (tg#51240) 2020-06-22 15:56:51 -05:00
Detective Google
715b1f85da prevents shunted AIs from doomsdaying (tg#51284) 2020-06-22 15:53:55 -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
Lin
bfe8ccdfb5 Merge pull request #11627 from kevinz000/combat_rework 
"Unofficial" Combat Rework Part 3: Blocking/Parrying
 2020-06-12 16:39:11 -05:00
Ghom
8cb15f9279 Actually Balanced and Standardized Vendor Prices. (#12495) 2020-06-09 22:22:53 -07:00
Ghommie
495ccc99c5 Porting some cargo/vending updates. 2020-06-08 06:12:51 +02:00
kevinz000
05fe0c7dcc ok 2020-05-30 00:59:29 -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
Ghom
cea958f822 Fixing various issues. (#12368) 
* Fixing various issues.

* Lights.
 2020-05-28 00:36:57 -07:00
Ghom
ce1f1bdf5e Turning a few components into elements. (#12325) 
* Turning a few components into elements.

* eh
 2020-05-24 13:06:27 -07:00
Ghom
ab5d65a454 Porting the BEPIS research machinery. (#12277) 
* Initial B.E.P.I.S port.

* All nodes but sticky tape are in. Sweet.

* Mapping the BEPIS :DDD

* ah

* deers.
 2020-05-24 13:05:15 -07:00
Ghommie
a84e7bcecc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-24 04:00:51 +02:00
Ghom
9eccef2836 Porting "Personal interaction messages to simple animals" and more. (#12268) 
* Porting "Personal interaction messages to simple animals" and more.

* Travis check.

* doc

* whoopsie.

* )
 2020-05-18 04:46:57 -07:00
Ghom
08280a853e Renames 'visible_atoms' and 'get_actual_viewers' procs to 'fov_view' and 'fov_viewers' (#12282) 
* Renames 'visible_atoms' and 'get_actual_viewers' procs to 'fov_view' and 'fov_viewers'

* Ok, signals.
 2020-05-17 17:04:15 -07:00
Ghom
335f5a37b9 Plane adjustments on several low layer objects. (#12286) 2020-05-17 17:02:57 -07:00
Ghom
12ac08d7c5 Porting tesla/electrocute code updates. (#12280) 
* Porting tesla/electrocute code updates.

* Why is the dominator being insta-deleted by zaps a good idea?

* Yikes.

* ah
 2020-05-17 16:35:17 -07:00
Ghommie
30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
Lin
658fd23feb Merge pull request #12216 from Citadel-Station-13/Ghommie-patch-1 
fixing light tubes / bulb lighting overlays being masked by... lighting.
 2020-05-16 23:45:44 +00:00
Ghom
7c7147cb3e Field of Vision component. (#12075) 
* Hopeless WIP for vision cones.

* Core component and hooks done

* Removing clutter.

* linter bashing me for using statements as args.

* Ok.

* continue

* bring back the macro

* Configs and openspace filter.

* Chat plane, reset perspective signal, mechs/vehicles cases, machineries.

* view, viewers and spoopy ghosts.

* Renamed component, admin fun button and snowflakes robots.

* Whoopsie.

* Yikes

* test merge tweak.

* radial yaketi sax.

* Fixed tgui UIs, some messages not displayed to the target.

* Documentation and a little bugfix.

* Pulling QoL, seventh plane made in this PR.

* Fix.

* Tweaks and improvements.

* Update randomverbs.dm
 2020-05-15 15:25:04 -07:00
Ghommie
7fb96ab0cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-05-12 20:06:59 +02:00
Ghom
bd19763236 Update lighting.dm 2020-05-12 00:18:27 +02:00
kevinz000
1cf2311930 Merge pull request #12164 from Ghommie/Ghommie-cit733 
Porting "Refactors language holder"
 2020-05-10 14:16:42 -07:00
kevinz000
c2e689aec0 i'm salty (#12181) 2020-05-10 21:33:56 +02:00
kevinz000
1981b6b3c7 Merge pull request #12130 from Ghommie/Ghommie-cit727 
Dims the lights, again.
 2020-05-08 23:30:19 -07:00
Ghommie
2858ddd90b Porting "Refactors language holder" 2020-05-08 22:44:02 +02:00
Ghommie
60bdbfaf61 Merge conflicts, procs instead of macros, mood signals. 2020-05-08 02:12:41 +02:00
Ghommie
3914c1bd65 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit727 2020-05-07 21:41:47 +02:00
Ghommie
a09c7180cb Dims the lights again. 2020-05-06 23:55:36 +02:00
kevinz000
5c5fc37959 Introducing noitatsxoB (#12073) 
* okay

* ok

* ok

* ok

* ok

* why am i doing this

* WHY DID I DO THIS

* mirror doesn't work

* compile

* shuttles should work

* fix engine

* fix engine

* off by 1

* ok

* adds proccall to write next map

* haha post processing funny

* fixes

* Update code/modules/mapping/map_template.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mapping/map_template.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mapping/map_template.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mapping/map_template.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-06 17:50:50 +02:00
Ghommie
001109cfcd About ready. 2020-05-05 20:58:44 +02:00
kevinz000
f50e661e0a Merge pull request #12106 from Putnam3145/revert-supermatter 
Reverts #10352.
 2020-05-04 21:21:09 -07:00
Ghommie
f770586407 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit723 2020-05-05 05:09:29 +02:00
Ghommie
643ef48f0e Macros, generic skill implementations. 2020-05-05 04:42:34 +02:00
Putnam
801956a1f9 Reverts #10352. 2020-05-03 17:44:00 -07:00
Ghommie
a194d7dafe merge conflict and job/dept discounts support. 2020-05-03 02:11:05 +02:00
coldud13
65104be982 rad collectors now announce when empty 2020-05-02 18:55:58 +10:00
Ghommie
94f014589d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-25 17:09:34 +02:00
Ghom
89e5681593 Fixing robo limb burn damage being unfixable. 2020-04-24 18:33:54 +02:00
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Putnam
a9600cffaa Replaces a xor with a power?? 2020-04-21 13:01:50 -07:00
Ghommie
c93f028a97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-21 01:53:41 +02:00
Ghom
6e62f7a2a3 Merge pull request #11878 from Arturlang/fixes_zipties_being_red 
Makes zipties white again
 2020-04-19 02:45:31 +02:00
Artur
bbd038bba6 Ghommies suggestion 2020-04-18 14:06:38 +03:00
Ghommie
87a6bd013c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-17 21:57:21 +02:00
Ghommie
4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
Artur
75dab9fa57 And some other fixes 2020-04-16 10:51:17 +03:00
Ghom
750acd7023 Update lighting.dm 2020-04-16 05:42:08 +02:00