 kevinz000
|
b983aa75ea
|
Merge pull request #11145 from Ghommie/Ghommie-cit586
Something about pAIs and silicon access priviledges.
|
2020-02-19 18:59:10 -07:00 |
|
|
Ghom
|
0619521418
|
Merge pull request #10980 from Trilbyspaceclone/cargo_memes_4
Corrects a few cargo crates/exports (and nerfs some)
|
2020-02-19 02:10:25 +01:00 |
|
|
Ghom
|
4d39bae16b
|
Merge pull request #11103 from PersianXerxes/cargoTraitorObjectivesRDumb
Clarifies comments and locks defusal kits behind an emag
|
2020-02-19 02:09:02 +01:00 |
|
|
Ghommie
|
698f0b8177
|
Something about pAIs and silicon access priviledges.
|
2020-02-18 16:20:44 +01:00 |
|
|
Trilbyspaceclone
|
8f653b4dd6
|
Update materials.dm
|
2020-02-17 15:48:31 -05:00 |
|
|
Trilbyspaceclone
|
3b82e34db6
|
Update code/modules/cargo/packs/emergency.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-02-17 15:48:02 -05:00 |
|
|
Ghom
|
a2583f5f7f
|
Update expressconsole.dm
|
2020-02-17 14:25:50 +01:00 |
|
|
Trilbyspaceclone
|
c5eaac62bd
|
Update materials.dm
|
2020-02-16 18:26:22 -05:00 |
|
|
Trilbyspaceclone
|
0315802330
|
Update armory.dm
|
2020-02-16 18:25:54 -05:00 |
|
|
Trilbyspaceclone
|
0f7618b348
|
Update organic.dm
|
2020-02-16 14:07:00 -05:00 |
|
|
Persi
|
18feba7fdd
|
Defusal kits are now emag only and don't require a drop pod console.
|
2020-02-16 00:14:15 -05:00 |
|
|
Persi
|
23a9b9b438
|
Master got fixed while I was at work!
|
2020-02-16 00:07:24 -05:00 |
|
|
Trilbyspaceclone
|
470e786765
|
Update expressconsole.dm
|
2020-02-15 15:59:09 -05:00 |
|
|
Persi
|
0c9244f669
|
Clarifies comments and locks defusal kits behind an emag
|
2020-02-15 14:17:22 -05:00 |
|
|
Ghommie
|
4a621fb1aa
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit560
|
2020-02-14 19:39:53 +01:00 |
|
|
Winter Flare
|
ac55d1d25d
|
Merge branch 'master' into tinytweaks-2-9-20
|
2020-02-13 03:34:44 -05:00 |
|
|
kevinz000
|
c790478a3d
|
Merge pull request #11012 from keronshb/RatvarDrink
Introduces the Ratvarian mixed drink, the CogChamp!
|
2020-02-12 23:58:14 -07:00 |
|
|
Trilbyspaceclone
|
4b880276d8
|
Update emergency.dm
|
2020-02-12 14:41:38 -05:00 |
|
|
Winter Flare
|
5549cd93f1
|
Merge branch 'master' into tinytweaks-2-9-20
|
2020-02-11 07:20:16 -05:00 |
|
|
keronshb
|
42fda3d88b
|
CogChamp
Adds the CogChamp drink! Bloodcult gets one so why not Clock?
|
2020-02-10 21:18:51 -05:00 |
|
|
Winter Flare
|
e11c8c3647
|
Fixing a moneymaking oversight.
|
2020-02-10 00:35:31 -05:00 |
|
|
Trilbyspaceclone
|
d49a53e193
|
Update costumes_toys.dm
|
2020-02-08 22:17:58 -05:00 |
|
|
Trilbyspaceclone
|
1e2562ed02
|
Update organic.dm
|
2020-02-08 18:59:00 -05:00 |
|
|
TrilbySpaceClone
|
e5236eebb1
|
hey lets do corrections
|
2020-02-08 17:39:00 -05:00 |
|
|
Seris02
|
4ec99a38e2
|
merge fixes
|
2020-02-07 15:28:05 +08:00 |
|
|
kevinz000
|
3f5805a9e8
|
Merge pull request #10798 from necromanceranne/secmainsrejoice
Formal security wear are now armor vests (HAS SOME BALANCE CONCERNS)
|
2020-02-06 23:52:49 -07:00 |
|
|
Ghommie
|
04261345dd
|
export scanners.
|
2020-02-06 23:08:32 +01:00 |
|
|
Ghommie
|
0703c6eea6
|
First tweak to cargo reagents selling.
|
2020-02-06 22:34:54 +01:00 |
|
|
kevinz000
|
d0cd33a5ea
|
Merge pull request #10899 from Trilbyspaceclone/vender-hate
Almost all venders now can be restocked
|
2020-02-05 23:44:30 -07:00 |
|
|
Seris02
|
d0100345fd
|
done hopefully
|
2020-02-05 17:00:38 +08:00 |
|
|
Seris02
|
6cc6aa12be
|
yeehaw it's done
|
2020-02-05 16:54:57 +08:00 |
|
|
kevinz000
|
f05d37b7fd
|
Merge pull request #10855 from Trilbyspaceclone/patch-274
The Syndicats are run by aliens - Fixes Alien cargo crate to be correction emag
|
2020-02-05 01:10:21 -07:00 |
|
|
TrilbySpaceClone
|
06fd6645b3
|
And it wokrs
|
2020-02-04 16:01:22 -05:00 |
|
|
Trilbyspaceclone
|
8458340541
|
Update science.dm
|
2020-02-04 14:38:24 -05:00 |
|
|
Trilbyspaceclone
|
e237fefbf4
|
Update science.dm
|
2020-02-04 06:45:37 -05:00 |
|
|
kevinz000
|
275b1f73e0
|
Merge pull request #10849 from Ghommie/Ghommie-cit547
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
|
2020-02-04 03:39:14 -07:00 |
|
|
Ghom
|
97be223b0b
|
Merge pull request #10799 from Seris02/goldentoolboxfix
makes the golden ""plastitanium"" toolbox actually plastitanium
|
2020-02-02 19:08:16 +01:00 |
|
|
Artur
|
e7ddfdd8d8
|
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
|
2020-02-02 13:31:54 +01:00 |
|
|
kevinz000
|
c94b5688db
|
Merge pull request #10810 from YakumoChen/ring
Adds ring jewelry
|
2020-02-02 03:16:01 -07:00 |
|
|
Trilbyspaceclone
|
6b2a8d49c9
|
Update science.dm
|
2020-02-02 01:39:25 -05:00 |
|
|
Seris02
|
18489e5b65
|
merge fixes
|
2020-02-02 11:51:26 +08:00 |
|
|
Ghommie
|
8de11845d5
|
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
|
2020-02-02 03:39:49 +01:00 |
|
|
Ghom
|
3337181cac
|
Merge pull request #10352 from Seris02/smchanges
Changes to the way SM handles power related to integrity and max integrity damage
|
2020-02-01 18:46:10 +01:00 |
|
|
YakumoChen
|
6c3069e944
|
less empty line
|
2020-01-31 14:15:13 +00:00 |
|
|
YakumoChen
|
32f3b31127
|
adds two crates
|
2020-01-31 08:54:07 -05:00 |
|
|
Seris02
|
81039b131b
|
fixes
|
2020-01-31 09:49:08 +08:00 |
|
|
necromanceranne
|
43c4debb4f
|
Repaths the formal security items into armor vest subtypes and subtypes of their respective owner's armors. Probably has some really silly balance ramifications. Oh and russian officers have armor vests now I guess. Oh and the sec wardrobe no longer has the formal suits.
|
2020-01-31 11:54:18 +11:00 |
|
|
Arturlang
|
83ce84cdc4
|
Merge branch 'master' into TGUIs_Nexties
|
2020-01-30 20:46:20 +02:00 |
|
|
Artur
|
d937ded07c
|
Fixes points
|
2020-01-30 18:54:39 +01:00 |
|
|
Ghom
|
f74475a6e0
|
Merge pull request #10749 from kevinz000/duke_moxley
It's high noon...
|
2020-01-30 00:19:37 +01:00 |
|