Commit Graph

8858 Commits

Author SHA1 Message Date
Heroman
13c2dcac9c Removes redundant sprite_stack definitions from ID files 2021-03-26 03:53:02 +10:00
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
Novacat
7646d7ad05 Merge pull request #9960 from VOREStation/upstream-merge-7974
[MIRROR] Added Doctress' Jager drink.
2021-03-18 10:39:37 -04:00
Novacat
dd01ae71ab Merge pull request #9961 from VOREStation/upstream-merge-7976
[MIRROR] Fixes Global and Fixes Eyes
2021-03-18 10:39:27 -04:00
Novacat
96173e6fc2 Update items.dm 2021-03-18 10:28:35 -04:00
Atermonera
da20d3f024 GPS presentation/update tweaks/fixes. 2021-03-18 05:03:53 -04:00
Novacat
1536b98caa Fixes Global and Fixes Eyes 2021-03-18 04:51:04 -04:00
Atermonera
3be2f30df2 Added Doctress' Jager drink. 2021-03-18 04:37:30 -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
Heroman
124a357e65 Adds a new maint pred mob 2021-03-11 17:49:37 +10:00
Atermonera
13889abe61 Tweaked implant loadout, refactored implant detection. 2021-03-10 14:18:58 -05:00
Novacat
5b249903d4 Merge pull request #9894 from VOREStation/upstream-merge-7955
[MIRROR] Adds an advanced version of the mining drill scanner.
2021-03-10 14:17:21 -05:00
Atermonera
26be40158e Merge pull request #7955 from FenodyreeAv/MiningScanner
Adds an advanced version of the mining drill scanner.
2021-03-10 13:59:00 -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
Schnayy
24435fb1b0 Merge pull request #7849 from Greenjoe12345/teshchair
Adds some new wheelchair types
2021-03-09 01:14:49 -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
Novacat
fcc45a8c41 Merge pull request #9865 from Heroman3003/sizespace-suit
Adds HYPER suit
2021-03-08 11:05:22 -05:00
Atermonera
4db820a2da Fixed/generalized loadout implants. 2021-03-08 02:05:32 -05:00
Heroman
5702604b41 Redoes the PR, adds HYPER suit instead 2021-03-08 10:11:10 +10: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
ecb982e6e9 Reworks bluespace suit, adds redspace suit 2021-03-07 14:08:25 +10: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