cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,646 Commits 8 Branches 0 Tags
0a037f0fe08d65d7b298fdc97f09450e91bf417c
Commit Graph

297 Commits

Author SHA1 Message Date
Leshana
83562acf66 POLARIS: Fix GetFlatIcon so that cameras and id pictures don't show the HUD overlays. 2018-01-14 23:00:10 -05:00
Arokha Sieyes
60c07e348b Merge pull request #2742 from VOREStation/aro-hudwork 
Plaaaaaaanessssssss
 2018-01-14 13:08:35 -05:00
Arokha Sieyes
ad74dec1c0 POLARIS: Planes shenanigans. Begins 'plane' work. 2018-01-14 00:39:59 -05:00
Arokha Sieyes
449dcbb0b7 Refactor Digestion 2018-01-10 02:06:13 -05:00
Arokha Sieyes
b9e8b9641c Various and sundry admin messages 2018-01-06 19:15:54 -05:00
Leshana
28c193cbdb Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04 
# Conflicts:
#       code/game/objects/items/devices/communicator/communicator.dm
#       code/modules/client/preference_setup/occupation/occupation.dm
#       code/modules/mob/living/simple_animal/animals/cat.dm
#       code/modules/mob/mob_helpers.dm
#       code/unit_tests/zas_tests.dm
#       maps/southern_cross/southern_cross-1.dmm
#       maps/southern_cross/southern_cross-3.dmm
#       maps/southern_cross/southern_cross-6.dmm
#       vorestation.dme
 2018-01-04 22:44:04 -05:00
MarinaGryphon
3f98312535 Ports hoists, as well as some macros, from Aurorastation. (#4451) 
* Ports hoists.

* Ports use_check
 2018-01-01 12:17:35 -08:00
Leshana
5ebcc92645 Port /tg garbage collection tweaks and statistics improvements 
https://github.com/tgstation/tgstation/pull/30118 - Garbage collection tweaks and refactors.
https://github.com/tgstation/tgstation/pull/32022 - Find references fix.
 2017-12-27 21:45:37 -05:00
Leshana
a435d73450 Ports /tg controller optimizations 
https://github.com/tgstation/tgstation/pull/31092 - Fixes subsystems not returning a qdel hint
https://github.com/tgstation/tgstation/pull/31494 - In which the stoner one gets stoned and tries to address tick contention... again
https://github.com/tgstation/tgstation/pull/31950 - Removes an empty New()
https://github.com/tgstation/tgstation/pull/31951 - Logs subsystem shutdowns
 2017-12-27 21:19:55 -05:00
Leshana
c6e8184b58 Ports https://github.com/tgstation/tgstation/pull/30184 
* Adds defines for world.tick_usage
* This provides no useful benefit whatsoever, but /tg and Baystation12 have done it, so it will make porting future code easier if we do too.  No real harm done either.
 2017-12-27 19:10:15 -05:00
Leshana
032d26010b Merging changes from /tg 
https://github.com/tgstation/tgstation/pull/29637 Fixes subsystem MC crash tracking
https://github.com/tgstation/tgstation/pull/30092 Subsystem PreInit() now respects init_order
 2017-12-27 18:58:51 -05:00
Leshana
67f85d1f90 Minor fixes to Polaris Merge 
* Fixes human HUD init so we still get all HUD variables filled.  - TODO - Make our own versions of synthetic HUD for other hud categories if we ever feel like it.
* Re-removed gameticker sound code, this time marked it as VOREStation edit (wasn't marked before)
* Removed duplicate mutable_appearance type now that it is moved to mutable_apperance.dm
 2017-12-23 21:54:07 -05:00
killer653
3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
Arokha Sieyes
7f0adf5d88 Attempt to clean up player_list if an issue is found 
Dangerous? Not any more than just leaving it, probably. I can't think of a case where player_list -= something wouldn't work, even in the case of nulls probably. And the no-depth [mob] lookup at the end is probably fine, even if it's a null, since it'll use byond's internal "what is this" handler to print the name or an icon or whatever it is.
 2017-12-12 15:24:55 -05:00
Neerti
acb208dd3f Works on New Blob 2017-11-29 22:35:01 -05:00
killer653
315711b314 Pol sync part 2 2017-10-27 15:30:51 -04:00
killer653
0c480ec15f Polaris sync 2017-10-27 15:30:24 -04:00
Anewbe
cad5ef12e7 Does work on the event manager role again 2017-10-18 20:00:01 -05:00
killer653
1bb71ef429 Polaris Sync 2017-10-16 22:16:24 -04:00
Mechoid
9a04744ab6 Turrets detect targets through metal foam. 2017-10-15 13:48:38 -07:00
Spades
4bc0708f01 Merge pull request #2282 from Cyantime/grublarvs 
Improves solargrub larva
 2017-10-12 18:12:31 -04:00
Cyantime
472ef624ca This can be condensed. 2017-10-11 15:28:45 -04:00
Verkister
3b5da0f1fa Adds toggleable hunger growls to vore panel. 
-Disabled by default.
-One tile range as with the other bellynoises.
-10% chance to manifest when "extremely hungry", same but a little louder when "starving".
 2017-10-11 22:07:24 +03:00
Cyantime
612db9b2c0 wooorms 2017-10-11 13:29:31 -04:00
Anewbe
4459d7087a Revert "Does more prep for the Event Manager role" 2017-10-04 18:33:34 -05:00
Anewbe
c2c6b5949a Does more prep for the Event Manager role 2017-10-02 21:51:48 -05:00
killer653
bddfa16f82 Polaris sync 2017-09-15 21:17:34 -04:00
Anewbe
6ffebcef6e Merge pull request #3775 from Neerti/9/8/2017_tg_maploader_port 
Port's TG's Maploader
 2017-09-11 17:17:23 -04:00
Neerti
1bc28c07c0 Port's TG's Maploader 2017-09-08 12:49:26 -04:00
Neerti
4bfcec55f2 work 2017-09-04 21:52:47 -04:00
Cyantime
499862bca6 Configurable mob spawners, re-implementation of trash mouse spawning. 2017-08-15 22:09:53 -04:00
killer653
a2f346df0f Makes wings their own seperate entity on char setup 2017-08-10 07:12:22 -04:00
killer653
468e73c7f3 Polaris sync 2017-08-06 19:07:17 -04:00
Neerti
36b0f5fa99 Even More Circuit Changes 
See PR for changes.
 2017-08-01 16:13:27 -04:00
killer653
34f2921ea6 Makes a fluff item indigestable. 
It's made with the fibers of some indigestable animal.
Or something. I dunno.
It could be magic for all I know.
 2017-07-30 15:30:41 -04:00
Leshana
18b1828631 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170630 2017-06-30 22:31:43 -04:00
Neerti
795fcd6306 Fixes Inability to use Say/LOOC/Other Things 
A null entry somehow got into ```player_list```, which caused an important proc called ```get_mobs_and_objs_in_view_fast()``` to fail.  The cause appeared to be a brain mob failing to qdel, then failing to ```logout()```, leaving a null entry in ```player_list```.
```get_mobs_and_objs_in_view_fast()``` now makes sure every entry it iterates over exists, and this should fix the qdel issue as well.
 2017-06-24 18:18:10 -04:00
Arokha Sieyes
7094209cdb Merge pull request #1741 from VOREStation/gc-data-record 
Fixes players not being removed from the manifest immediately when cryoing.
 2017-06-15 18:39:27 -04:00
Leshana
93318a5345 Fixes players not being removed from the manifest immediately when cryoing. 
* The cryopod simply qdel's the datacore records. Old garbage.dm hard-del()'d datums, so it was fine.  Now we need to make sure they are actually removed from the data_core.
* Testing shows this fixes #1713 and in most cases the objects also GC cleanly.  However some older computers still retain hard references to data_core entries. But even in the cases where that prevents a clean GC, the player is still removed from the manifest successfully and promptly, so that can wait.
 2017-06-15 17:19:52 -04:00
Arokha Sieyes
6e5c63d3a5 Changes protector sprite, adds flashlight 2017-06-13 21:39:46 -04:00
Leshana
7f60e98633 Merge remote-tracking branch 'polaris/stonedmc-update' into stonedmc-update 
# Conflicts:
#	code/_helpers/game.dm
#	code/controllers/subsystem.dm
#	code/controllers/subsystems/garbage.dm
#	code/game/objects/items/devices/PDA/PDA.dm
#	maps/RandomZLevels/stationCollision.dm
#	maps/RandomZLevels/wildwest.dm
#	maps/~map_system/maps.dm
#	vorestation.dme
 2017-06-11 15:35:42 -04:00
Leshana
5a02b7e5c7 More and more Destroy() cleanups all across the board - Return qdel hints. 2017-06-10 22:41:51 -04:00
PsiOmegaDelta
7b47590645 Port of @PsiOmegaDelta's Baystation12/Baystation12#16820 
Ports tg's garbage collector subsystem and Destroy() returning qdel hints.
 2017-06-10 22:41:51 -04:00
Leshana
fb92653ac9 Ports "Makes global master vars static" 
* https://github.com/tgstation/tgstation/pull/27523
 2017-06-10 19:01:58 -04:00
Anewbe
5d81148ab8 Merge pull request #3511 from VOREStation/garbage-subsystem 
tg Garbage Subsystem
 2017-06-10 17:20:22 -05:00
Arokha Sieyes
389aba627c Merge pull request #1679 from VOREStation/aro-sclogging 
Soulcatcher chat logging, and subtle logging for free
 2017-06-10 15:29:09 -04:00
Arokha Sieyes
f7423b649d Merge pull request #1673 from VOREStation/aro-talkfix 
Cheap hack fix for get_blahblah_fast breaking due to null in list
 2017-06-10 15:28:52 -04:00
Arokha Sieyes
cd29b7de86 Soulcatcher chat logging, and subtle logging for free 
Logs soulcatcher messages to the chat log so admins can review them, since that's kinda important, and gives subtle it's own logging format so you can tell it's a subtle and not just an emote. Also disables subtles while in the soulcatcher because apparently that was a thing.
 2017-06-10 14:57:32 -04:00
Arokha Sieyes
bd72434b0b Cheap hack fix for get_blahblah_fast breaking due to null mobs in player_list 
Just have it clean them on nulls. This check should be fast, the list isn't that long, and it checks other stuff anyway.
 2017-06-10 03:15:03 -04:00
Leshana
69a50ec225 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170609 
# Conflicts:
#	code/_macros.dm
#	code/controllers/master_controller.dm
#	vorestation.dme
 2017-06-09 22:54:16 -04:00