shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,862 Commits 5 Branches 0 Tags
bd88bc8ecaae8a366cd5382764eb7dee341db5c9
Commit Graph

674 Commits

Author SHA1 Message Date
Putnam
8458f97692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-05-12 13:34:31 -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
Putnam
f4f80594bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-05-11 17:10:55 -07:00
Putnam
e8d7da56f4 Ported C++mos from yogs (help me) 2020-05-11 15:44:26 -07: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
kevinz000
1f900f0e9d Merge pull request #11829 from Citadel-Station-13/Ghommie-patch-5 
Fixing a whacky miniature cell duping issue.
 2020-04-14 01:34:45 -07:00
Ghom
b00e97b848 Merge pull request #10732 from kevinz000/eldritch_affairs 
Eldritch Affairs
 2020-04-12 20:47:19 +02:00
Ghom
ab2d458947 Update lighting.dm 2020-04-12 07:12:54 +02:00
Putnam3145
474d6a486d Merge pull request #11773 from Arturlang/cablefix 
Fixes cablecuff making producing 0 amount cables
 2020-04-09 01:28:30 -07:00
Artur
0a234d5618 TABS NOT SPACES 
AAAAAAAA
 2020-04-09 09:32:23 +03:00
Artur
75a2dd6900 Finnishing touches, hopefully 
Tweaks some indendation
 2020-04-08 18:32:45 +03:00
Artur
3cf6524389 Makes it nicer, removes check_cable_amount 
Putnam suggested this as well
 2020-04-08 18:28:35 +03:00
Arturlang
cdd2f55cac Putnams suggestion 
Makes use() a if, as to use it as a further sanity check

Co-Authored-By: Putnam3145 <putnam3145@gmail.com>
 2020-04-08 18:24:14 +03:00
Artur
c9ab705c80 Ghommies suggestion 2020-04-07 16:08:38 +03:00
Artur
c4ff1cd322 Coding is hard, mkay? 2020-04-07 14:39:00 +03:00
Ghommie
f6db5764e3 Bringing back accidentally reverted solar panel fixes. 2020-04-06 18:20:34 +02:00
Putnam3145
5108bf1fc3 Stuff about power (#11664) 
* Overhauled how APCs work, I guess

* Makes cells drain like before
 2020-04-06 04:26:14 +02:00
Arturlang
598179553e Changes making cablecuffs to using cable in your hand, instead of a menu. (#11702) 
* There we go

* Ghommie suggestions
 2020-04-03 18:34:26 +02:00
actioninja
abde27c098 layer changes 2020-03-28 23:50:08 -07:00
kevinz000
c39dd52b5f Merge remote-tracking branch 'citadel/master' into eldritch_affairs 2020-03-27 21:32:40 -07:00
Putnam3145
5147536eb3 yeah whoops that should go (#11561) 2020-03-22 13:01:51 +01:00
kevinz000
18471be4ce cult team 2020-03-10 20:11:18 -07:00
kevinz000
e210f7d535 Merge pull request #11391 from Ghommie/Ghommie-cit612 
Porting "Further update_icon splitup"
 2020-03-10 05:58:17 -07:00
Ghommie
ee1eea8874 Ports "Switches out the three billion args of electrocute act for flags" 2020-03-09 04:01:23 +01:00
Ghommie
59b1a223a3 Ok, done. 2020-03-08 22:51:36 +01:00