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,673 Commits 8 Branches 0 Tags
478016793c057c64662ab8f424232b8af9d88e07
Commit Graph

30807 Commits

Author SHA1 Message Date
Arokha Sieyes
478016793c Shadekin set realname when shifting 
Only humans do automatically, it seems. Not an issue for admins, but later it might be.
 2018-02-18 21:29:27 -05:00
Aronai Sieyes
ee022c1f79 Merge pull request #3063 from VOREStation/aro-boxes 
Boxes + Air Pumps + Intercoms
 2018-02-18 20:35:07 -05:00
Arokha Sieyes
eb78b87458 Add orange/green shadekin 2018-02-18 20:05:44 -05:00
Arokha Sieyes
9f74137a87 VS: Specific changes for boxes and pumps 2018-02-18 19:38:01 -05:00
Arokha Sieyes
33539aa0f4 POLARIS: Ports Bay oxygen/anesthetic pumps 2018-02-18 13:14:57 -06:00
Arokha Sieyes
cabe2676e9 POLARIS: Moves most boxes to use starts_with 2018-02-18 13:03:05 -06:00
Aronai Sieyes
c36d01939c Merge pull request #3061 from VOREStation/aro-sync 
Smol Sync
 2018-02-18 00:56:41 -06:00
Arokha Sieyes
9d9d735b99 Remove misplaced debug statement 2018-02-18 00:44:02 -06:00
Arokha Sieyes
5ec475d563 Travis bull 2018-02-18 00:37:00 -06:00
Aronai Sieyes
9fe14358a7 Merge pull request #3060 from VOREStation/aro-sklang 
Gives shadekin a (private, unlearnable) language
 2018-02-18 00:35:12 -06:00
Aronai Sieyes
5c22da4cc0 Merge pull request #3059 from Mewchild/ringfix 
Ringfix v2
 2018-02-18 00:33:09 -06:00
Arokha Sieyes
5967bb6dc5 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 
# Conflicts:
#	code/game/objects/items/weapons/storage/boxes.dm
#	code/game/objects/items/weapons/storage/storage.dm
#	code/modules/mob/living/carbon/human/species/species.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-6.dmm
 2018-02-18 00:25:36 -06:00
Aronai Sieyes
4d9eacbd75 Adds mars 2018-02-18 00:22:43 -06:00
Leshana
f34a0f104e Revert adding unnecessary proc and fixing paths for vietsi custom item. 2018-02-18 00:47:10 -05:00
Aronai Sieyes
b1b2551b9c Merge pull request #3058 from VOREStation/aro-joinspeed 
Half character-join lag
 2018-02-17 23:41:05 -06:00
Arokha Sieyes
4feee9a8ab Gives shadekin a (private, unlearnable) language 2018-02-17 23:39:21 -06:00
Arokha Sieyes
55ba550409 More optimizations for character joins 2018-02-17 23:24:11 -06:00
Mewchild
6af91caf6b Ringfix v2 2018-02-17 23:02:41 -06:00
Aronai Sieyes
a979d3e586 Merge pull request #3057 from VOREStation/aro-listshort 
Make turf obfuscation lists lazy
 2018-02-17 22:44:13 -06:00
Anewbe
09f7f798d3 Power monitoring consoles find all station-related sensors (#4853) 2018-02-17 20:40:32 -08:00
elgeonmb
c359d8aae4 unions no longer make firearms (#4836) 2018-02-17 20:40:15 -08:00
Arokha Sieyes
d12860aef8 Make turf obfuscation lists lazy 2018-02-17 21:55:59 -06:00
Leshana
0806ca868b Fix same-size mobs walking on each other and being unable to bump doors. 
* handle_micro_bump_helping was unconditionally returning TRUE, overriding normal bump behavior.  Fixed to only return TRUE when its size conditions are met.
* As a side effect of that bug, now_pushing was not being set back to zero.  Fixing the prior bug solved that, but as an extra precaution, moved now_pushing = 0 out of the proc so it will get set back no matter what.
 2018-02-17 22:44:12 -05:00
Arokha Sieyes
0dd7a2e2e3 Initial cleanup/changes 2018-02-17 19:47:39 -06:00
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
Anewbe
7cc8fa0cba Gives Miners shinybits. (#4840) 
* Gives miners marker beacons, moves their locker to another file

* Makes marker beacons ITEM_SIZE_SMALL
 2018-02-17 11:19:48 -08:00
Anewbe
077b73a446 Suit coolers don't magically shut off in mild fires (#4820) 2018-02-17 11:19:21 -08:00
Anewbe
16295de3cf Merge pull request #4829 from VOREStation/pol-ghostbox 
Lets animals and ghosts look in boxes/backpacks/whatever
 2018-02-17 10:06:06 -06:00
Anewbe
329a65be08 Merge pull request #4838 from VOREStation/pol-emerboxes 
Port Bay's survival boxes
 2018-02-17 10:05:39 -06: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
Arokha Sieyes
dec6941fea Fix for borgs accidentally getting into useless grab/disarm intents 2018-02-16 22:46:43 -06:00
Aronai Sieyes
81f946c724 Merge branch 'master' into pol-ghostbox 2018-02-16 22:22:35 -06: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
Arokha Sieyes
f4d0ec3fb8 Port Bay's survival boxes 
Includes some tweaks to items that usually come in the boxes to make them more similar to the Bay implementation.
 2018-02-16 19:21:15 -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