cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-29 11:32:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,468 Commits 6 Branches 0 Tags
7c492a3d17ec54cb5c0158979f9827a57cb15d53
Commit Graph

1184 Commits

Author SHA1 Message Date
Anewbe
b9007d11a8 Merge pull request #3493 from VOREStation/just-stonedmc 
Port of StonedMC master controller framework
 2017-06-04 16:15:13 -05:00
Leshana
b17fb86721 Tweaks Statpanel and System Initialization 2017-06-01 21:42:08 -04:00
Leshana
197a648795 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01 
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/ammunition/magazines.dm
 2017-06-01 17:27:00 -04:00
Kelshark
641246155c Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	config/custom_items.txt
#	icons/mob/vore/taurs_vr.dmi
 2017-06-01 17:25:39 -04:00
Spades
8579adcc53 Naming convention of ammo is now consistent 
s = Speedloaders. (Functionally the same as clips, but they're not
_really_ the same thing, just in case we change these later.)
c = Clips. (Can also be used to fill other magazines.)
m = Magazine. (Holds ammo rounds.)
a = Ammo. (Individual rounds of ammo.)
 2017-05-26 19:32:23 -04:00
Leshana
5f5ea3ea3b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-merge-2017-05-26 
# Conflicts:
#	code/game/gamemodes/technomancer/spells/insert/mend_burns.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_metal.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_organs.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_wires.dm
#	code/game/machinery/computer/Operating.dm
#	code/game/machinery/computer/camera.dm
#	code/game/machinery/computer/communications.dm
#	code/game/machinery/computer/security.dm
#	code/game/machinery/computer/skills.dm
#	code/game/objects/items/devices/radio/jammer.dm
#	html/changelogs/.all_changelog.yml
#	maps/~map_system/maps.dm
#	nano/images/nanomap_z1.png
#	nano/images/nanomap_z5.png
 2017-05-26 15:29:46 -04:00
Kelshark
15b8fcbe6d Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/machinery/computer/communications.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	config/custom_items.txt
#	icons/misc/title_vr.dmi
#	icons/mob/human_races/r_def_xenochimera.dmi
#	maps/RandomZLevels/fileList.txt
#	vorestation.dme
 2017-05-24 13:46:58 -04:00
Leshana
ecd19ee1af Adds an admin verb to debug the current map datum. 
Useful for making sure it loaded right.
 2017-05-21 14:16:39 -04:00
Kelshark
71c0531829 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/multiz/basic.dm
#	config/custom_items.txt
 2017-04-29 10:13:45 -04:00
Arokha Sieyes
4ae0352474 Fix debug verb for "Check Areas" 2017-04-24 14:26:05 -04:00
Kelshark
e1eae846f9 Merge branch 'master' of https://github.com/VOREStation/VOREStation 2017-04-18 19:29:23 -04:00
Kelshark
fb47e064d5 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	maps/RandomZLevels/labyrinth.dmm
 2017-04-18 19:25:46 -04:00
Leshana
70a32fcfc6 Adds admin verbs for debugging process controllers 
* Adds a verb for debugging any of the running process controllers.  Unlike the old debug controller verb, this one is not hard coded, so any present and future processes will be included.  Requires R_DEBUG (and R_ADMIN if in paranoid mode)
* Adds a verb for debugging the process scheduler itself.  This is hidden by default until debug verbs are shown.   Requires R_DEBUG (and R_ADMIN if in paranoid mode)
 2017-04-18 19:04:38 -04:00
Leshana
2e59e24dca Merge branch 'master' of ../Polaris into polaris-sync 2017-04-16 20:58:40 -04:00
Arokha Sieyes
aaeae6695a Make planets more generic 
So that Sif doesn't have to be the only one!
 2017-04-14 21:36:48 -04:00
Kelshark
8ee9f436ea Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/objects/items/weapons/tools.dm
#	code/modules/mob/dead/observer/say.dm
#	config/custom_items.txt
#	vorestation.dme
 2017-04-13 19:43:56 -04:00
Neerti
75cc189723 Merge pull request #3271 from VOREStation/aro-pol-panic 
Quick & Dirty Panic Bunker Port
 2017-04-11 21:55:59 -04:00
Arokha Sieyes
66327aecc7 Quick & Dirty Panic Bunker Port 
Tested on our server, works. Doesn't work if you don't have a DB (how would it?).
 2017-04-11 00:13:43 -04:00
Arokha Sieyes
ba1221889c Fix 'if' statement on Panic Bunker 
Prints error message when it doesn't need to and works fine. Also moves check up slightly to prevent an exploit.
 2017-04-11 00:12:32 -04:00
Arokha Sieyes
b3d652fa50 Quick & Dirty Panic Bunker Port 
Should work! Should.
 2017-04-10 22:38:58 -04:00
Arokha Sieyes
e7d8af7ae7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 
# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/mob/mob.dm
#	html/changelogs/.all_changelog.yml
 2017-04-10 20:41:18 -04:00
Arokha Sieyes
a2ec0d43f1 Fix 'Spawn Character' DNA 
Made spawned characters always use male sprites and not have accurate DNA. Also would runtime if you picked the option to not put a mind in, as it assumed there would be one.
 2017-04-10 14:40:43 -04:00
Arokha Sieyes
2d1e2d091e Fix 'Spawn Character' DNA 
Made spawned characters always use male sprites and not have accurate DNA. Also would runtime if you picked the option to not put a mind in, as it assumed there would be one.
 2017-04-10 14:39:09 -04:00
Anewbe
e9c4b5a3eb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things 
# Conflicts:
#	icons/mob/back.dmi
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
 2017-04-07 16:11:50 -05:00
Arokha Sieyes
85a489b9b6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 2017-04-04 20:25:00 -04:00
Anewbe
6a95f6c87f Merge branch 'master' into apron_pockets 2017-04-04 17:54:38 -05:00
Anewbe
1e7bf50a4c Automute shouldn't go off if you didn't type anything 2017-04-03 14:14:52 -05:00
Anewbe
8e9db2b7d4 Aprons now have pockets 2017-04-02 00:28:20 -05:00
Anewbe
7bb3f5fbb7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things 
# Conflicts:
#	code/datums/supplypacks/medical.dm
#	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
#	code/modules/clothing/shoes/miscellaneous.dm
#	code/modules/clothing/suits/labcoat.dm
#	icons/mob/back.dmi
#	icons/mob/feet.dmi
#	icons/mob/human_face.dmi
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/shoes.dmi
#	icons/obj/clothing/suits.dmi
#	icons/obj/storage.dmi
#	maps/northern_star/polaris-2.dmm
#	maps/northern_star/polaris-5.dmm
 2017-04-01 12:45:45 -05:00
Kelshark
139dbf132c Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	maps/RandomZLevels/listeningpost.dmm
#	vorestation.dme
 2017-03-26 00:20:03 -04:00
Anewbe
560af2d61d Merge pull request #3116 from VOREStation/spawn 
Makes the 'Spawn Character' verb include custom items
 2017-03-21 18:38:23 -05:00
Arokha Sieyes
17bd2d341a Makes the 'Spawn Character' verb include custom items 
Only really works if you pick the option to put them in the mob, because the proc that spawns custom items is based on that, and I don't really want to rework the custom items system for such a small fix.
 2017-03-21 09:48:55 -04:00
Arokha Sieyes
25a84af366 Makes the 'Spawn Character' verb include custom items 
Only really works if you pick the option to put them in the mob, because the proc that spawns custom items is based on that, and I don't really want to rework the custom items system for such a small fix.
 2017-03-21 09:44:02 -04:00
Arokha Sieyes
805b473976 Polaris Sync Merge 
Fixed Polaris merge conflicts
* Space controller merge conflict
 2017-03-18 00:58:12 -04:00
Neerti
d4b6fc9f32 Merge pull request #3052 from Anewbe/emp_things 
Reworks empulse and emp_act
 2017-03-14 21:39:01 -04:00
Kelshark
25d81c8acf Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/admin/verbs/buildmode.dm
#	code/modules/multiz/movement.dm
#	code/modules/multiz/structures.dm
#	code/modules/multiz/turf.dm
#	config/custom_items.txt
#	vorestation.dme
 2017-03-10 20:34:12 -05:00
Leshana
12ab0e4da2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06 2017-03-06 22:46:28 -05:00
Leshana
a5a805414b Fixed paths references to obsolete path /obj/item/clothing/shoes/combat 
* It was changed in most places to /obj/item/clothing/shoes/boots/combat but some were not.  The changling subtype prevented any compile errors.
 2017-03-06 21:58:39 -05:00
Leshana
f53dfde515 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06 
# Conflicts:
#	code/game/objects/items/blueprints.dm
#	vorestation.dme
 2017-03-06 20:58:38 -05:00
Anewbe
05e6ef5ad8 Merge pull request #2988 from Anewbe/boots 
Boots are now a subtype of shoes
 2017-03-05 14:13:47 -06:00
Anewbe
19710d9bd8 Reworks empulse and emp_act 2017-03-05 12:22:45 -06:00
Kelshark
081e280e27 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/global.dm
#	config/custom_items.txt
#	icons/mob/human_races/r_xenochimera.dmi
#	vorestation.dme
 2017-03-03 19:17:04 -05:00
Neerti
0f781e36a7 Adds Multi-Z Test Map 2017-03-03 09:40:34 -05:00
Arokha Sieyes
387f429e5e Merge large polaris changes 2017-03-02 22:44:17 -05:00
Anewbe
25b925f04c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into boots 
# Conflicts:
#	maps/northern_star/polaris-1.dmm
#	maps/northern_star/polaris-2.dmm
 2017-03-02 16:53:29 -06:00
Neerti
12abb2d6f2 Ports a large chunk of the map datum system that europa/bay uses. 
Links many map-specific details such as the station name, z-level information, and allowed jobs from global vars to map datum vars, which should help us maintain multiple maps at once in the future, which will be needed for the future Southern Cross.
Note that a config change will be needed to change GENERATE_ASTEROID to GENERATE_MAP, otherwise no changes should be required to continue normal map usage.
To change to a different map, it's suggested to tick the file that ticks all the other needed files, which for the Northern Star is called northern_star.dm.
 2017-02-27 07:36:41 -05:00
Anewbe
2de037fbbf Ports a bunch of fluff stuff 2017-02-21 13:50:14 -06:00
Neerti
d398367e4c Fixes a world << that crept in and apparently new lobby code. 2017-02-20 19:29:13 -05:00
Neerti
836d8dfa3f More stuff, finalizes it I hope. 2017-02-20 18:28:31 -05:00
Kelshark
5b6c8aeab6 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/clothing/under/miscellaneous_vr.dm
#	code/modules/mob/living/carbon/human/human_movement.dm
#	config/custom_items.txt
 2017-02-12 00:32:26 -05:00