cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 12:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,631 Commits 8 Branches 0 Tags
1d32ab92f0daf8ed294cdfd3b45e6fca84c59e7b
Commit Graph

30775 Commits

Author SHA1 Message Date
Arokha Sieyes
1d32ab92f0 Clean up some recent update_icons() changes 2018-02-17 19:06:02 -05:00
Leshana
ef3df27528 VOREStation Specific Merge Changes 
* PolarisSS13/Polaris#4818 with VOREStation/VOREStation#3004
* Repath /obj/item/weapon/material/knuckledusters to /obj/item/clothing/gloves/knuckledusters
* Keep lights on explorer hoods
* Don't map in anti-xeno tasers from Polaris lore.
 2018-02-17 16:56:31 -05:00
Leshana
5edfc7516b Adjust VOREStation guns for PolarisSS13/Polaris/#4185 2018-02-17 16:56:30 -05:00
Leshana
7ed3d2c2f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16 
# Conflicts:
#	code/_onclick/hud/screen_objects.dm
#	code/game/objects/items/weapons/storage/storage.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/gloves/color.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/simple_animal/aliens/alien.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/goose.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/mob_defines.dm
#	code/modules/projectiles/projectile/special.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	vorestation.dme
 2018-02-17 00:35:29 -05:00
Aronai Sieyes
6d0aba7f4a Merge branch 'master' into aro-puppers 2018-02-16 19:33:52 -06:00
Aronai Sieyes
49e945afb7 Merge pull request #3023 from Screemonster/stopkillingthedamncat 
Adds newspapering, fixes mob digestion toggle, and other tweaks
 2018-02-16 19:33:20 -06:00
Anewbe
ae974977f1 Merge pull request #4849 from Cyantime/patch-2 
Allows the pocket newscaster to fit in pockets
 2018-02-16 12:53:34 -06:00
Anewbe
ab9f296adb Merge pull request #4837 from Schnayy/giftitems 
Gift items + Cargo crate
 2018-02-16 12:52:59 -06:00
Anewbe
b34ee7d087 Merge pull request #4843 from PrismaticGynoid/universalponchos 
Department ponchos for all
 2018-02-16 12:52:27 -06:00
Anewbe
004ff0166d Merge pull request #4822 from VOREStation/pol-sa-playerqol 
Player-controlled SA QoL
 2018-02-16 12:52:14 -06:00
Anewbe
b8058d5cc7 Merge pull request #4825 from VOREStation/pol-mob-glow 
Extend mob 'glow' capabilities
 2018-02-16 12:50:54 -06:00
Anewbe
897833b0fc Merge pull request #4848 from VOREStation/pol-shoes 
Walking with nonshoes on feet causes runtimes
 2018-02-16 12:50:28 -06:00
Anewbe
79b8c283f7 Merge pull request #4845 from Heroman3003/grill-typo 
Fixed typo in unfastening grille
 2018-02-16 12:50:18 -06:00
Cyantime
b0b821cb71 Adds hidden alarms, for air alarms, fire alarms, and APCs (#4816) 
* Adds hidden alarms

* TRUE/FALSE defines

* Renames var to alarms_hidden
 2018-02-16 12:50:06 -06:00
Anewbe
2f4df23c0b Merge pull request #4841 from MisterLayne/space_grilles 
Allows you to grille in space.
 2018-02-16 12:46:07 -06:00
Screemonster
33a384d5c3 makes them swat back, tweaks to exclude list 2018-02-16 10:19:12 +00:00
Cyantime
d64bf6fd7e Shrinks pocket newscaster 2018-02-16 02:23:58 -05:00
Aronai Sieyes
78d7ef1d72 Port Bay-style attack animations (#4827) 
* POLARIS: Attack animations

* POLARIS: Overlay flick system

You can't do this in Byond, unfortunately, so here's some code from /tg/

* Make attack anims a preference
 2018-02-15 22:02:04 -06:00
Aronai Sieyes
15a5e5e10b Merge branch 'master' into pol-sa-playerqol 2018-02-15 21:56:53 -06:00
Arokha Sieyes
6b0b76b78a POLARIS: Walking with nonshoes on feet causes runtimes 2018-02-15 21:45:40 -06:00
Arokha Sieyes
f3acd961d3 POLARIS: Walking with nonshoes on feet causes runtimes 2018-02-15 21:44:59 -06:00
Arokha Sieyes
61dc4f53fc Refactor step code, and taur messages 2018-02-15 21:43:48 -06:00
Anewbe
5a309f1aa1 Merge pull request #4826 from VOREStation/pol-sa-hostile 
Don't require hostile SAs for special purposes
 2018-02-15 21:07:40 -06:00
Anewbe
12e8b9d22b Merge pull request #4832 from VOREStation/pol-ghostview 
Remove the admin ghostview verb
 2018-02-15 21:02:47 -06:00
Anewbe
4be61a3485 Merge pull request #4828 from VOREStation/pol-sa-armor 
Allow Simple Animals to have armor in a normal sensible way
 2018-02-15 21:02:14 -06:00
Anewbe
6fd448a3ad Merge pull request #4821 from VOREStation/pol-sa-attacktext 
Allow simple_animal to have more than one attack verb
 2018-02-15 20:55:41 -06:00
Heroman3003
bd6ef1b09f Fixed typo in unfastening grille 
Grille, not grill
 2018-02-16 11:38:12 +10:00
Anewbe
4b3a234972 Merge pull request #4830 from VOREStation/pol-deu 
Prevent infinite deuterium
 2018-02-15 19:12:52 -06:00
Anewbe
cd0394c88b Merge pull request #4834 from VOREStation/pol-borgbright 
Fixes lack of borg fullbright with mesons etc
 2018-02-15 19:12:33 -06:00
Anewbe
0360116ac5 Merge pull request #4823 from VOREStation/pol-sa-seedarkness 
Fix the seedarkness variable
 2018-02-15 19:12:08 -06:00
Leshana
45c8aa5b16 Small Fixes and Refactor (#4819) 
* Fix not calling parent in fake gloves.

* Refactor machinery.dm to use constants instead of bare numbers and strings.
 2018-02-15 19:11:04 -06:00
PrismaticGynoid
3e8109e8c6 Department ponchos for all 
Removes the job restrictions on the department ponchos, making them able to be taken from the loadout by any job, just like the department jackets.
 2018-02-15 16:26:55 -08:00
Aronai Sieyes
67c7641d36 Merge pull request #3042 from Heroman3003/slugfix 
Fix for crushing and new descriptions for Taur stompies
 2018-02-15 18:17:03 -06:00
Aronai Sieyes
2fbbf52f40 Merge pull request #2974 from Cyantime/nobinoc 
Removes binoculars from xenoarch lockers
 2018-02-15 18:16:14 -06:00
Aronai Sieyes
b95d2656a9 Merge pull request #3041 from VOREStation/aro-2810 
Prevents respirocytes from flooding rooms with O2
 2018-02-15 18:05:30 -06:00
Aronai Sieyes
1dd86332d3 Merge pull request #3035 from VOREStation/aro-3022 
Additional safety checks for removal of AI hologram
 2018-02-15 18:05:22 -06:00
Aronai Sieyes
ab7ca34d37 Merge pull request #3034 from VOREStation/aro-3028 
Moves the 'Toggle Agility' verb into Abilities
 2018-02-15 18:05:01 -06:00
Aronai Sieyes
f66fccfb40 Merge pull request #3037 from VOREStation/aro-3005 
Make shuttle doors transparent (they do have windows...)
 2018-02-15 18:04:52 -06:00
Aronai Sieyes
702997ffba Merge pull request #3036 from VOREStation/aro-3010 
Fixes NSFW mode selection
 2018-02-15 18:00:26 -06:00
Aronai Sieyes
f042649448 Merge pull request #3030 from VOREStation/vplk-lightswitches 
Make light switches constructable
 2018-02-15 17:58:20 -06:00
Arokha Sieyes
a88dfd0d20 Make attack anims a preference 2018-02-15 17:44:21 -06:00
MisterLayne
87d1c85534 I will fite these '<<'s. 2018-02-15 17:16:02 -05:00
Heroman3003
7b6ac1391f fix for condition 
dumb error
 2018-02-16 07:24:05 +10:00
Heroman3003
b0a627463b fix for crushing and taur stepping expanded 
More descriptions for different intents of stepping for different taurs + fixed harm trampling not dealing any damage
 2018-02-16 07:13:22 +10:00
Anewbe
a93cb256ec Ports Vorestation's emp effects and ion projectiles (#4818) 2018-02-15 12:29:33 -08:00
BillyBangles
f5dfbff1bd Build igloos and snowmen (#4811) 
* adds packed snow brick material

* makes snow walls spawnable for mapping

* adds snowmen

craft them with snow. duh.

* snow spider triggers arachnophobia

also changelog.
 2018-02-15 14:25:51 -06:00
Anewbe
7e2df51283 Changes mine code, adds random mine spawners (#4817) 2018-02-15 12:19:58 -08:00
Arokha Sieyes
58d62f3b69 Corrects SA projectile damage accidental removal 
Now it just adjusts the Proj's damage instead of doing brute damage directly, so it can be affected by armor and whatever complex things living/bullet_act checks.
 2018-02-15 04:04:20 -06:00
Arokha Sieyes
cf7754a55a Fixes #2810 2018-02-15 03:42:49 -06:00
Schnayy
02447e5c19 The largest PR I've probably actually done. Adds the following: 
* Bouquets
* Fake Bouquets. Can be won from arcade machines.
* Heart box chocolates containing a set arrangement of chocolates.
* Adds said chocolates (milk chocolate, white chocolate, and truffles) all bite-sized.
* Adds 5 cards, one blank and four with covers. Function identical to paper except you can't make an airplane because I hate fun.
* Adds The four cards with covers, 3 real bouquets, and 2 chocolate boxes to cargo under a 'gift crate' for 10 points.

Sprites by me. Code would not be possible without cerebul's help. Let me know if I've goofed on something, but I did test all of the items + ordering them from cargo.
 2018-02-15 03:33:23 -06:00