cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-02 13:34:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,691 Commits 7 Branches 0 Tags
8d2ec5f7fa62b83cb2eabf2283ffc3072e3efb21
Commit Graph

8444 Commits

Author SHA1 Message Date
Killian
187c991835 add blueshield special access 2020-03-14 20:35:42 +00:00
Izac Joof Forsgren
e9b0e27257 Merge branch 'master' into izac 2020-03-05 18:32:15 +01:00
Repede
6e293183ad Merge branch 'release' of https://github.com/VOREStation/VOREStation into releaseupdate 
# Conflicts:
#	icons/mob/hud.dmi
 2020-03-04 08:17:38 -05:00
Heroman3003
dd8f1f6d2b Fixes sofa not refunding any material (#6784) 2020-03-03 15:54:54 -05:00
izac112
3a05bd0e5f adds , 2020-03-03 06:34:54 +01:00
izac112
34482e31f8 Update security.dm 2020-03-03 06:33:53 +01:00
izac112
9a2458e28a Update security.dm 2020-03-03 06:33:07 +01:00
izac112
e4b7f16960 Probably a better solution 2020-03-03 06:20:55 +01:00
izac112
45e2e72203 Removes the extra energy gun the hop has for some reason. (which they should not have) 2020-03-03 06:19:10 +01:00
Hawk_v3
f2b8f92b63 Merge remote-tracking branch 'upstream/master' into releaseupdate 2020-03-02 17:55:11 +00:00
Heroman
743ae581af Removes _vr only sofa definitions 2020-03-02 13:46:37 +10:00
Repede
c45d7c2196 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/modules/events/event_container_vr.dm
#	icons/misc/title_vr.dmi
#	interface/skin.dmf
#	vorestation.dme
 2020-03-01 12:35:52 -05:00
Novacat
54c792ba9b Merge pull request #6648 from VOREStation/aro-medstand 
Replace IV drips with medical stands
 2020-03-01 10:54:45 -05:00
Novacat
d98cd87585 Merge pull request #6646 from VOREStation/aro-salv 
Add salvageable machines
 2020-03-01 10:54:21 -05:00
Novacat
f7e3d95286 Merge pull request #6640 from VOREStation/aro-headsets 
New cent/NT headset sprites
 2020-03-01 10:53:37 -05:00
Novacat
ed04dbf730 Merge pull request #6639 from VOREStation/aro-rollers 
New rollerbed sprites
 2020-03-01 10:53:21 -05:00
Novacat
c613176292 Merge pull request #6633 from Heroman3003/podremove 
Replaces emag interaction with pizza voucher
 2020-03-01 10:53:09 -05:00
Novacat
d0b92789be Merge pull request #6628 from VOREStation/aro-chairs 
Add a few new chair types
 2020-03-01 10:52:54 -05:00
Novacat
b44f8e0911 Merge pull request #6592 from VOREStation/vchat-rebase 
VChat: Redone chat output in Vue.js
 2020-03-01 10:51:29 -05:00
Novacat
b1669f3674 Merge pull request #6708 from VOREStation/upstream-merge-6713 
[MIRROR] Fixes communicator newsfeed app.
 2020-02-29 18:54:22 -05:00
Atermonera
b1e33cd82a Fixes communicator newsfeed app. (#6713) 
* Fixes communicator newsfeed app.
Fixes non-terminal while loop in get_latest_news(), helper.dm
Newscaster posts now have a world.time-esque timestamp number, so they can be (almost) uniquely identified

* whoopsie
 2020-02-29 18:05:50 -05:00
Novacat
c63ba4a349 Nerfs Chameleon Kit Boxes (#6763) 
* Nerfs Chameleon Kit Boxes

Because of the way chameleon kits start with items, the boxes start with a ton of storage slots to hold all the items. Sometimes people grab the boxes, dump out the original contents and stuff a ton of stuff into them as a result.

This refactors it so that all the chameleon stuff starts in the backpack instead, so chameleon kit boxes themselves are no longer superboxes

* Unnecessary comma
 2020-02-29 18:02:21 -05:00
Aronai Sieyes
db04d43f2c Made the new chairs steelsheet constructable 2020-02-29 13:02:43 -05:00
Aronai Sieyes
0d7b1d7240 Fix bug with setting icon for breather 2020-02-29 12:00:48 -05:00
Aronai Sieyes
e5b9cb57de Add additional chairs 2020-02-29 11:46:11 -05:00
Atermonera
b1720d2653 Defibrilators can be charged in rechargers 2020-02-27 23:55:07 -05:00
Novacat
aad8aada9f Merge pull request #6690 from VOREStation/upstream-merge-6744 
[MIRROR] Adds holoPDA from Aurora
 2020-02-26 22:45:53 -05:00
Atermonera
1c7dd9631c Merge pull request #6744 from listerla/pda-holo 
Adds holoPDA from Aurora
 2020-02-26 21:04:50 -05:00
Atermonera
695ea645fe Merge pull request #6740 from Heroman3003/orangeyellow 
Adds orange and yellow cloth materials
 2020-02-26 20:26:40 -05:00
Novacat
1c80ed2a88 Merge pull request #6622 from Shadow-Quill/Holowarrant 
Holowarrants can now only be authorized by an ID with HoS access
 2020-02-25 10:50:30 -05:00
Novacat
c545032a5f Merge pull request #6677 from VOREStation/upstream-merge-6737 
[MIRROR]  Makes pen click when you click on them
 2020-02-24 20:28:15 -05:00
Novacat
650007f9e7 Merge pull request #6672 from VOREStation/upstream-merge-6729 
[MIRROR] Fix and tweak station Railguns.
 2020-02-24 20:26:32 -05:00
Novacat
97b86d4d1d Merge pull request #6670 from VOREStation/upstream-merge-6726 
[MIRROR] Adds holster, lighter, and seatbelt sounds from World Server.
 2020-02-24 20:25:57 -05:00
Novacat
d4a8a9332b Merge pull request #6666 from VOREStation/upstream-merge-6718 
[MIRROR] Added two chemical spill PoIs + More Immersive PoI Names
 2020-02-24 20:24:35 -05:00
Atermonera
cc487ceebf Merge pull request #6737 from listerla/penclick 
Makes pen click when you click on them
 2020-02-24 16:20:09 -05:00
Atermonera
55704e0760 Merge pull request #6729 from Mechoid/RailgunFixxo 
Fix and tweak station Railguns.
 2020-02-24 16:15:04 -05:00
Atermonera
16183867df Adds holster, lighter, and seatbelt sounds from World Server. 2020-02-24 16:12:37 -05:00
Atermonera
5e2a692610 Added two chemical spill PoIs + More Immersive PoI Names 2020-02-24 16:02:31 -05:00
Atermonera
b26daf5fb1 Hide items in plant pots and plushies 2020-02-24 16:01:08 -05:00
Heroman
726664f6f0 Makes all sofa colors/subtypes makeable 2020-02-24 18:19:56 +10:00
Heroman
7c2e86f90f Fixes IDs being dropped from cryopods 2020-02-24 10:03:35 +10:00
Repede
4cf7f71be6 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/mining/ore_box.dm
#	code/modules/paperwork/paper.dm
#	code/modules/rogueminer_vr/zone_console.dm
#	config/custom_items.txt
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
#	maps/tether/tether_defines.dm
 2020-02-22 12:38:04 -05:00
Atermonera
11eed81b92 Ports precision placement of items 2020-02-22 02:35:41 -05:00
Arokha Sieyes
0cb233514a Replace IV Drips with medical stands 2020-02-22 00:51:49 -05:00
Aronai Sieyes
5a75891c77 Salvageable machines 2020-02-21 16:54:41 -05:00
Aronai Sieyes
7206d8e7f4 New cent/NT headset sprites 
Old ones green?
 2020-02-21 11:46:36 -05:00
Aronai Sieyes
11edb0febe New rollerbed sprites 
Less eye-melting blue
 2020-02-21 11:34:09 -05:00
Heroman
67b6e7e160 Changes the behaviour of emagged pizza voucher 2020-02-21 17:06:40 +10:00
Atermonera
1010fd283b Merge pull request #6690 from VOREStation/vplk-ntnet-fixer 
Fixes to Modular Computers and NTNet Relays
 2020-02-21 01:58:20 -05:00
Heroman
0210d3de35 Removes emag interaction from pizza voucher 2020-02-21 13:45:59 +10:00