Commit Graph

5483 Commits

Author SHA1 Message Date
VerySoft
09080b6bc2 Adds alternative ID cards!
Uses the event cards to plop in some alternative ID card thingies I made a while back. Maybe use for events, maybe people can use for fluff items! I donno, I just like them so I thought I would plop them in.

I should note, that none of these start with any access or ranks set, and you set that up by using the card in your hand, and then using it on the ID you have access set on.

There's some other card sprites in there too for some other stuff but I didn't figure we'd want those set up like this so! They can be used for adminbus or whatever.
2021-03-25 07:27:00 -04:00
Heroman
f3db65f4f6 coding standards, citadel, use these 2021-03-25 04:38:07 +10:00
Heroman3003
86e723ad36 Merge branch 'master' into idfix3 2021-03-25 04:20:31 +10:00
Heroman3003
07744c3931 un-conflict 2021-03-25 03:07:06 +10:00
Heroman3003
4fe91b1201 un-conflict 2021-03-25 03:06:36 +10:00
Novacat
2604385dcd Update id_stacks.dm 2021-03-24 12:26:29 -04:00
Heroman
fc1d4da50b More fixes for god of fixes 2021-03-24 19:16:23 +10:00
Atermonera
28e200ce68 Patches new ID card code 2021-03-24 05:12:10 -04:00
Heroman
79a54de823 Fixes "" 2021-03-24 17:45:17 +10:00
Heroman
5faf57d8e6 Also refactors them all a lil. 2021-03-24 15:47:10 +10:00
Heroman
5ad1c15b98 Fixes Fluff and ITG ID cards 2021-03-24 15:17:45 +10:00
Heroman
8d8000f84d Fixes gold IDs somehow having forgotten the sprites 2021-03-24 06:59:36 +10:00
Heroman
362a5129af Adjusts IDs to match vorestation status quo 2021-03-23 18:02:31 +10:00
Novacat
a770ab4f7e Update syndicate_ids.dm 2021-03-22 01:37:43 -04:00
Killian
0ec52d3f20 New ID Card Design 2021-03-21 22:29:44 -04:00
Cerebulon
382cbd4a93 News Update + Communicator Lag Fix (#7973)
* News Update + Communicator Lag Fix

* combined if. please merge this has been up way too long
2021-03-21 17:13:24 -04:00
MistakeNot4892
37717fe7b2 Tachikoma tweaks. (#7988)
* Fixes erroneous copypaste in tachikoma join string.

* Nerfs tachikoma speed.

* Nerfs tachikoma armour.

* Added wirecutters and welder to recon platform kit.

* Swaps the explo platform chainsaw to emag item, gives them a machete instead.

* Prevents ghosts from mousedropping crates onto platforms.
2021-03-19 05:04:00 -04:00
BillyBangles
1b3e00be7e Makes custom cigarettes even more custom-ier (#7925)
* can now add multiple items to rolling papers

* adds blunt wraps and blunts

* un-scuffs the scuffed code
more scuffed up than a wooden middle school gym floor after a dodgeball game

* further optimization
2021-03-19 03:22:19 -04:00
Novacat
6639eb9d30 Merge branch 'master' into upstream-merge-7935 2021-03-18 10:42:23 -04:00
Atermonera
da20d3f024 GPS presentation/update tweaks/fixes. 2021-03-18 05:03:53 -04:00
Atermonera
20f4ff8384 Added think-tanks. 2021-03-18 04:09:42 -04:00
Unknown
213d383c09 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7697 2021-03-11 10:01:39 -05:00
Atermonera
13889abe61 Tweaked implant loadout, refactored implant detection. 2021-03-10 14:18:58 -05:00
Atermonera
02d8653734 Merge pull request #7949 from Meghan-Rossi/e-cig
E-cigarette improvements
2021-03-10 13:51:46 -05:00
Novacat
b782fed522 Merge pull request #9867 from VOREStation/upstream-merge-7928
[MIRROR] Added a GPS compass.
2021-03-09 17:58:49 -05:00
Unknown
620da227bd Resets GPS.dm 2021-03-09 17:43:49 -05:00
Unknown
190b805cad this sucks 2021-03-09 15:49:07 -05:00
Novacat
a4dfb9c97b Merge branch 'master' into upstream-merge-7756 2021-03-09 15:24:53 -05:00
Novacat
465b3ed92f Merge pull request #9869 from VOREStation/upstream-merge-7921
[MIRROR] Adds a modular armour version of the explorer suit and adds sprites to specialist armour
2021-03-09 15:16:52 -05:00
Novacat
cc7f72a991 Merge branch 'master' into upstream-merge-7756 2021-03-09 15:11:54 -05:00
Novacat
dde17fefb2 Merge pull request #9876 from VOREStation/upstream-merge-7953
[MIRROR] Fixed/generalized loadout implants.
2021-03-08 11:52:46 -05:00
Atermonera
4db820a2da Fixed/generalized loadout implants. 2021-03-08 02:05:32 -05:00
FenodyreeAv
efd319c851 Adds a modular armour version of the explorer suit and adds sprites to specialist armour 2021-03-07 15:37:53 -05:00
Unknown
f2557a4834 Gateway for Heads, Pilot to Civ
- Adds gateway access to all heads of staff
- Moves pilot to Civilian department, though for PTO purposes they still count as exploration.

This is the result of some staff discussions.
2021-03-07 15:02:48 -05:00
Atermonera
964714e6ba Added a GPS compass. 2021-03-07 14:16:58 -05:00
Heroman
34e78e477d Removes outdated comments 2021-03-07 06:12:38 +10:00
Heroman
4c67f0a286 Removes advantage macrotaurs have with saddlebag slowdown. 2021-03-07 06:10:57 +10:00
Mechoid
f5ade3682c Adds the Restraining Bolt. 2021-02-28 18:04:08 -05:00
Unknown
973f183e37 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 2021-02-28 16:16:11 -05:00
Unknown
e6db218e71 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7697 2021-02-28 14:29:46 -05:00
MistakeNot4892
3e804dc799 Sideports a couple of init unit tests from Neb. 2021-02-27 13:05:16 -05:00
Novacat
acda75223e Revert "Moar Typo Fixy" 2021-02-26 00:34:18 -05:00
TheFurryFeline
b3c7746e9f Moar Typo Fixy
Fix a descstring for Pizza Voucher having "both" twice. Do tell me if this double was intentional, and will pass along to player who pointed this out to me.
2021-02-25 19:31:57 -05:00
H0lySquirr3l
c6b757f5f6 Add files via upload 2021-02-23 17:47:38 -06:00
Unknown
2d07f1ac1f Emag Changes
- Trash pile Emags are a lot rarer now.
- Gun Permits are no longer gamma trash pile loot
- You can now find out how many uses are remaining on an emag
- Adds a 'used' variant of emag for adminbus purposes
2021-02-20 13:28:02 -05:00
H0lySquirr3l
80f0de4b9d Update manuals_vr.dm 2021-02-18 19:03:38 -06:00
H0lySquirr3l
7004a93b71 Update manuals_vr.dm 2021-02-18 18:57:44 -06:00
H0lySquirr3l
7f7e867528 Update manuals_vr.dm 2021-02-18 18:56:38 -06:00
H0lySquirr3l
a73975ba4b Add files via upload 2021-02-17 13:11:36 -06:00
Aronai Sieyes
eee1ce7c04 Don't call attack_self programatically on this 2021-02-17 09:57:31 -05:00