8b8b949d5f
Adminbus area modifications
2021-03-28 17:35:55 -04:00
2664382e67
Merge pull request #9976 from H0lySquirr3l/master
...
Micro March beta update.
2021-03-26 19:21:57 -04: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
74c8af64e2
Technomancer Fixes
...
-Instability no longer causes a feedback loop if a bunch of people are clumped together.
-Fixes runtime with illusions
-Fixes carbonmob illusions not copying appearance correctly.
2021-03-23 15:49:19 -04:00
362a5129af
Adjusts IDs to match vorestation status quo
2021-03-23 18:02:31 +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
6ed3b91df2
Earlyports gibber cryopod fix
...
haha completely harmless machine go brrrrr
Fixes despawner cryopods literally tearing the occupant into little pieces and making them croak audibly before despawning them.
2021-03-21 14:50:44 +02:00
0c3861d395
Update Space Station 13 areas_vr.dm
2021-03-19 17:43:22 -05:00
2a62d18b74
Add files via upload
2021-03-19 17:27:30 -05: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
d6e8a28ebe
Merge pull request #9958 from VOREStation/upstream-merge-7968
...
[MIRROR] Clicking on turfs while dragging something no longer closes the door
2021-03-18 10:39:56 -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
711c8f9685
Merge pull request #9968 from VOREStation/upstream-merge-7980
...
[MIRROR] GPS presentation/update tweaks/fixes.
2021-03-18 10:39:03 -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
756c21fbcf
Merge pull request #7985 from kcin2001/patch-1
...
adds ticket redemption
2021-03-18 04:57:18 -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
4d5639d874
Merge pull request #7968 from Shadow-Quill/Door-Pulling-QOL-Fix
...
Clicking on turfs while dragging something no longer closes the door
2021-03-18 04:16:33 -04:00
20f4ff8384
Added think-tanks.
2021-03-18 04:09:42 -04:00
af975aa70b
Updates Department Flags
2021-03-12 19:09:55 -05:00
f8910213bf
Fixes bug with entertainer
2021-03-12 18:59:27 -05:00
f5330aa1c5
Moves Technomancer logs to attack_log
2021-03-12 17:35:11 -05:00
213d383c09
Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7697
2021-03-11 10:01:39 -05:00
9d2061a085
Merge pull request #9913 from Heroman3003/sect-drone
...
Adds a new maint pred mob
2021-03-11 09:48:13 -05:00
124a357e65
Adds a new maint pred mob
2021-03-11 17:49:37 +10:00
d2e4c326fb
Fixes fighters being so slow
2021-03-10 19:46:54 -05:00
b936cd6f25
Updates the _vr recipies to include copper.
2021-03-11 06:35:28 +10:00
401f1eaa62
Merge pull request #9897 from VOREStation/upstream-merge-7963
...
[MIRROR] Tweaked implant loadout, refactored implant detection.
2021-03-10 14:40:05 -05:00
5e3e76ddf9
Merge pull request #9895 from Novacat/nova-basicfixes
...
Fixes Industrial Expansion
2021-03-10 14:26:53 -05:00
c92fbc73fe
Compatability
2021-03-10 14:24:14 -05: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
Unknown