4690411915
Remove unnecessary 'signatures'
2021-04-08 12:39:14 -04:00
02b93082ef
tram+station take 2
2021-04-05 06:06:45 +01:00
be762a81ed
[DNM] holster stuff, doesn't work yet
2021-04-03 22:25:03 -04:00
7452f4a704
Merge branch 'master' into aprilfools
2021-04-01 02:52:36 +10:00
989e1d0853
Merge pull request #8012 from MistakeNot4892/bird
...
Tesh gliding tweaks.
2021-03-31 04:24:39 -04:00
72d1741b6b
Tanning Tweaks
2021-03-30 01:50:39 -04:00
ddd2cc7dcb
Merge branch 'master' into aprilfools
2021-03-30 03:31:35 +10:00
5c61e2583c
Merge branch 'master' into aprilfools
2021-03-30 03:26:44 +10:00
8844a0cb02
Merge pull request #10032 from Novacat/nova-ert
...
Adminbus Area Modifications
2021-03-29 13:21:54 -04:00
fc0ed975c5
Merge pull request #10029 from Very-Soft/morealtids
...
MORE ALT ID STUFF
2021-03-28 19:58:35 -04:00
8b8b949d5f
Adminbus area modifications
2021-03-28 17:35:55 -04:00
c072f96104
Compatibility Fixes
2021-03-28 16:20:09 -04:00
da6f853210
MORE ALT ID STUFF
...
So basically I made one for all the station jobs, and then made one that when you use it, will become whatever job you are when you use it the first time. I added these to the loadout under utility as contractor identification cards!
I also did the same thing for the ITG IDs, but I did not put them on the loadout. People can fluff for them if they want to though! ITG is just a little more stringent in its hiring process than NT is.
I ALSO put in tons of pieces (which I used to make most of these) so that if someone wants to make more of them, or modularize some of them for whatever, they can! There's some alternative icon types and stuff in here too for making IDs for factions that don't exist or whatever! :0
I also removed Harmony's fluff ID and replaced it with the polymorphic ITG ID, since it's effectively the same thing but more generalized.
2021-03-27 20:55:16 -04:00
c586a83071
Repathed/renamed seromi to teshari.
2021-03-26 15:38:02 -04:00
6e0e34279b
Merge branch 'master' into aprilfools
2021-03-26 15:19:13 +10:00
13c2dcac9c
Removes redundant sprite_stack definitions from ID files
2021-03-26 03:53:02 +10:00
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
f3db65f4f6
coding standards, citadel, use these
2021-03-25 04:38:07 +10:00
86e723ad36
Merge branch 'master' into idfix3
2021-03-25 04:20:31 +10:00
07744c3931
un-conflict
2021-03-25 03:07:06 +10:00
4fe91b1201
un-conflict
2021-03-25 03:06:36 +10:00
2604385dcd
Update id_stacks.dm
2021-03-24 12:26:29 -04:00
fc1d4da50b
More fixes for god of fixes
2021-03-24 19:16:23 +10:00
28e200ce68
Patches new ID card code
2021-03-24 05:12:10 -04:00
79a54de823
Fixes ""
2021-03-24 17:45:17 +10:00
5faf57d8e6
Also refactors them all a lil.
2021-03-24 15:47:10 +10:00
5ad1c15b98
Fixes Fluff and ITG ID cards
2021-03-24 15:17:45 +10:00
8d8000f84d
Fixes gold IDs somehow having forgotten the sprites
2021-03-24 06:59:36 +10:00
362a5129af
Adjusts IDs to match vorestation status quo
2021-03-23 18:02:31 +10:00
c208e1e12d
Finishes it up
2021-03-22 16:13:20 +10:00
a770ab4f7e
Update syndicate_ids.dm
2021-03-22 01:37:43 -04:00
0ec52d3f20
New ID Card Design
2021-03-21 22:29:44 -04:00
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
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
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
6639eb9d30
Merge branch 'master' into upstream-merge-7935
2021-03-18 10:42:23 -04:00
7646d7ad05
Merge pull request #9960 from VOREStation/upstream-merge-7974
...
[MIRROR] Added Doctress' Jager drink.
2021-03-18 10:39:37 -04:00
dd01ae71ab
Merge pull request #9961 from VOREStation/upstream-merge-7976
...
[MIRROR] Fixes Global and Fixes Eyes
2021-03-18 10:39:27 -04:00
96173e6fc2
Update items.dm
2021-03-18 10:28:35 -04:00
da20d3f024
GPS presentation/update tweaks/fixes.
2021-03-18 05:03:53 -04:00
1536b98caa
Fixes Global and Fixes Eyes
2021-03-18 04:51:04 -04:00
3be2f30df2
Added Doctress' Jager drink.
2021-03-18 04:37:30 -04:00
20f4ff8384
Added think-tanks.
2021-03-18 04:09:42 -04:00
213d383c09
Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7697
2021-03-11 10:01:39 -05:00
124a357e65
Adds a new maint pred mob
2021-03-11 17:49:37 +10:00
13889abe61
Tweaked implant loadout, refactored implant detection.
2021-03-10 14:18:58 -05:00
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
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
02d8653734
Merge pull request #7949 from Meghan-Rossi/e-cig
...
E-cigarette improvements
2021-03-10 13:51:46 -05:00
e1d7458624
Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7919
2021-03-09 19:32:09 -05:00
Aronai Sieyes