Commit Graph

280 Commits

Author SHA1 Message Date
kappa-sama
ab5223cb20 this took longer than all the other items combined 2020-01-10 22:40:10 -05:00
kappa-sama
0dbcf2085b bye 2020-01-10 22:30:45 -05:00
kappa-sama
9f95fb5d9b cya 2020-01-10 22:29:02 -05:00
kappa-sama
6abb7449c3 bye 2020-01-10 22:27:01 -05:00
kappa-sama
861a3c7a11 zee 2020-01-10 22:25:16 -05:00
kappa-sama
0f7b3f4ee8 death 2020-01-10 22:23:32 -05:00
kappa-sama
4ebc80e137 bye bye 2020-01-10 22:21:45 -05:00
kappa-sama
0079a5acad byye 2020-01-10 22:19:13 -05:00
kappa-sama
ff3370d382 bye 2020-01-08 16:50:49 -05:00
kappa-sama
87698297fb bye bye 2020-01-08 16:47:28 -05:00
kappa-sama
a4da8a2dc4 bye 2020-01-08 16:37:38 -05:00
Lin
718d4a080d Merge pull request #9878 from Ghommie/Ghommie-cit382
Unmodularize several machinery and structures
2020-01-07 00:31:24 +00:00
Commandersand
815e57697d vending 2019-12-27 12:29:39 -06:00
Ghommie
8c5e506a17 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit382 2019-12-21 18:22:58 +01:00
Lin
3dc00519fc Merge pull request #9910 from Ghommie/Ghommie-cit390
Unmodularize gamemodes folder.
2019-12-19 23:23:20 +00:00
Ghommie
563a0fef3c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit390 2019-12-13 02:45:53 +01:00
Ghommie
4502d7b795 Ports improved and simplier fire alarms. 2019-12-12 22:44:20 +01:00
Putnam3145
beddaa1a99 Merge pull request #10053 from Ghommie/Ghommie-cit429
Fixes some means of eyes blindness not working, removes legacy code.
2019-12-09 12:40:37 -08:00
Ghommie
723690bab0 Demodularize defib disks and projectiles icons. 2019-12-06 23:07:50 +01:00
Ghommie
238655d599 Fixes eyes blindness a little. 2019-12-06 00:10:50 +01:00
Lin
99e9c7299e Merge pull request #10004 from Ghommie/Ghommie-cit414
Unmodularizing first aid kits.
2019-12-03 01:30:51 +00:00
Putnam3145
8d09f5a082 Merge branch 'master' into tinytweaks 2019-12-01 23:24:56 -08:00
Ghommie
9b8ed8ca4f The fact we hit 10k on issues/PRs is not a good reason to make crappy PRs. 2019-11-29 07:14:51 +01:00
BlackMajor
c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
Winter Flare
fb4a47d310 Added more items to vendors.
-Added stuff to the following:
clothing vendor
chef utensil vendor
snack vendors
kinkmate
2019-11-23 15:58:04 -05:00
Lin
028fa518e4 Merge pull request #9879 from Ghommie/Ghommie-cit383
Unmodularize closets.
2019-11-23 05:39:33 +00:00
Ghommie
0ac188bde9 Unmodularize gamemodes folder. 2019-11-22 05:00:53 +01:00
Ghommie
10373c7c96 Unmodularize closets. 2019-11-20 06:41:59 +01:00
Ghommie
fe171ac40a Unmodularize several machinery and structures. 2019-11-20 06:13:57 +01:00
Ghommie
411310b0c6 Unmodularize tools and apc icons. 2019-11-20 05:18:15 +01:00
Ghommie
21f15e411d Part 3 2019-11-19 19:34:42 +01:00
Ghommie
dd101ef221 Part 2 2019-11-19 18:00:56 +01:00
Lin
c188c20f37 Merge pull request #9802 from Ghommie/Ghommie-cit349
Unmodularize bikehorns and holy weapons.
2019-11-19 03:24:38 +00:00
Ghommie
c20bc123ab Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit336 2019-11-15 01:10:39 +01:00
Ghommie
5bb6247a6d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit349 2019-11-15 00:57:38 +01:00
kevinz000
02e8a73265 Merge pull request #9737 from Ghommie/Ghommie-cit326
Ports techweb backend refactor & co.
2019-11-14 16:45:09 -07:00
kevinz000
d6f540faf7 Merge pull request #9796 from Ghommie/Ghommie-cit347
Unmodularize airlocks.
2019-11-14 16:24:56 -07:00
kevinz000
bd650e53da Merge pull request #9795 from Ghommie/Ghommie-cit346
Unmodularize areas.
2019-11-14 16:24:36 -07:00
kevinz000
2f4562a63b Merge pull request #9656 from Ghommie/Ghommie-cit290
Purging a lot of space indention in favor of tabs.
2019-11-14 15:55:04 -07:00
Ghommie
248586cfd7 Unmodularize bikehorns and holy weapons. 2019-11-13 20:28:19 +01:00
Ghommie
b83f92be0e Unmodularize airlocks. 2019-11-13 06:50:35 +01:00
Ghommie
f55a602319 Unmodularize areas. 2019-11-13 06:13:18 +01:00
Ghommie
63da5ffb13 ID console fixes and other tweaks. 2019-11-11 17:10:14 +01:00
Ghommie
e977ba6729 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-10 23:17:58 +01:00
Ghommie
1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01:00
kevinz000
d9fd6cd176 Merge pull request #9735 from Ghommie/Ghommie-cit325
Unmodularizing 2/3 of the sounds folder.
2019-11-10 11:45:28 -07:00
kevinz000
92455b5b8c Merge pull request #9695 from Ghommie/Ghommie-cit311
Unmodularize and update pAI/Intellicards very slighty.
2019-11-10 11:40:14 -07:00
Ghommie
b2b1390bd3 Ports techweb backend refactor & co. 2019-11-07 05:07:38 +01:00
Ghommie
d48f1aad8a Yea, moving a few of them to voices. Do you vocalize? 2019-11-07 00:48:56 +01:00
Ghommie
9cac543a2b Unmodularize secway and turfs 2019-11-05 05:47:25 +01:00