cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,100 Commits 9 Branches 0 Tags
ead166d8c81418db042e3f5576272a19dcadaf42
Commit Graph

27904 Commits

Author SHA1 Message Date
Atermonera
e75a922faa Merge pull request #5248 from VOREStation/pol-colorb 
Colorblindness
 2018-05-05 12:15:04 -07:00
Atermonera
2a3dc2fb46 Merge pull request #5250 from Cameron653/patch-2 
Fixes a comment with spears that caused developers to scratch their heads.
 2018-05-05 12:14:34 -07:00
Atermonera
99890c29fe Merge pull request #5244 from Mechoid/Fix_Those_Fucking_Uploads 
Fix upload console runtimes.
 2018-05-05 12:12:12 -07:00
Atermonera
2748ceb170 Merge pull request #5243 from Anewbe/sleeping_pills 
Soporific and Chloral work when ingested again
 2018-05-05 12:09:37 -07:00
elgeonmb
439de7a4cf ATC Revamp, Part One Of Unknown (#5238) 
* adds a shitload of new atc content
 2018-05-05 12:09:08 -07:00
Cameron653
e47fe15fbf Fixes a comment that caused developers to scratch their heads. 
Glass has a hardness of 30 https://github.com/PolarisSS13/Polaris/blob/master/code/modules/materials/materials.dm#L433

Thrown_force_divisor multiplies by 1.5. 
WHY THE HELL IS THIS A MULTIPLIER INSTEAD OF A DIVISOR ???? WHAT MADMAN NAMED THESE VARIABLES? https://github.com/PolarisSS13/Polaris/blob/master/code/game/objects/items/weapons/material/material_weapons.dm#L56

p.s: Marble spear does 50 damage per hit. may wanna nerf that. It's a 2 tile attack that does 50 damage. 
When thrown, marble spear does 39 damage, since it multiplies the blunt damage (26) by 1.5
 2018-05-03 22:44:07 -04:00
Arokha Sieyes
98eb796021 Colorblindness 2018-05-03 17:58:22 -04:00
Atermonera
2a16467f8a Merge pull request #5219 from VOREStation/vplk-nanoui-multi-template 
NanoUI multiple templates example.
 2018-05-03 11:12:56 -07:00
Anewbe
70b23e905e Merge pull request #5209 from VOREStation/pol-medsound 
Ports the medical item sounds from Bay
 2018-05-02 22:11:03 -05:00
Anewbe
13ceb7af14 Merge pull request #5215 from Lorwp/eventmsg 
Cleans up Event messages
 2018-05-02 21:55:23 -05:00
Neerti
cd2a538526 Merge pull request #5207 from Novacat/bluespace_duffle 
Dufflebag of Holding
 2018-05-02 22:41:27 -04:00
Mechoid
c032a297da Tenth time's the charm. Fix upload console runtimes by passing module.install user. 2018-05-02 19:00:17 -07:00
Anewbe
2b9fb9398a Soporific and Chloral work when ingested again 2018-05-02 17:35:26 -05:00
Anewbe
1e052007e0 Chemicals should process again 2018-05-02 13:09:29 -05:00
Atermonera
2dda310687 Merge pull request #5182 from Anewbe/meteor_nerf 
Meteor events have fewer waves with less dangerous meteors
 2018-05-01 20:46:02 -07:00
Lorwp
2d793fb738 Add \the when practical 
Also `[station_name()]` to `the [station_name()]` in dust.dm
 2018-05-02 08:58:07 +10:00
Anewbe
7d0f8e8502 Merge pull request #5234 from VOREStation/pol-vs-3584 
Fix signlang being totally broken
 2018-05-01 15:43:04 -05:00
Anewbe
6f7c000e1a Merge pull request #5236 from VOREStation/pol-vs-3539 
Fix decloner design in protolathe
 2018-05-01 15:39:26 -05:00
Atermonera
847590758b Merge pull request #5233 from VOREStation/pol-vs-3594 
Resolve shower curtain/steam layering issue
 2018-05-01 13:02:16 -07:00
Atermonera
c3ac0870b6 Merge pull request #5235 from VOREStation/pol-vs-3611 
Fix wonky PDA eject messages
 2018-05-01 13:01:26 -07:00
Atermonera
44cc2e26c7 Merge pull request #5229 from Neerti/4/29/2018_remove_world_REMOVE_WORLD 
for(var/bad_code in world)
 2018-05-01 13:00:18 -07:00
Atermonera
40ba73a7a4 Merge pull request #5231 from VOREStation/pol-vs-3604 
Allow cancelling in chem master modals for pills
 2018-05-01 12:39:42 -07:00
Atermonera
b75b3c539e Merge pull request #5226 from Lorwp/drillmeta 
Destroys Drill meta 2: Electric Boogaloo
 2018-05-01 12:38:19 -07:00
Atermonera
27f0814bac Merge pull request #5216 from VOREStation/vplk-smelter-cleanup 
Quick cleanup of mineral processing unit code
 2018-05-01 12:37:27 -07:00
Mechoid
1db4c4b677 ~Promethean Tweaks: The one with the chemicals, and the other thing. (#5201) 
* Promethean Tweaks Round Howevermany We're On Now

* Tweak again. Drinks only plink damage that can be regenned. Multiple drinks, or other sources of tox will still mean these are dangerous.

* Add Blurb other than just "What has science done?"

* Adds the changelog.

* Fixes the stupid.

* Fixfix @ Ater
 2018-05-01 12:23:47 -07:00
Anewbe
7eaff9b3e0 Merge pull request #5222 from VOREStation/pol-freezer 
Increase zealousness of Portable Freezer item whitelist
 2018-05-01 10:18:34 -05:00
Arokha Sieyes
42abca3c31 Fix decloner design in protolathe 
As reported in https://github.com/VOREStation/VOREStation/issues/3539, you can't put chemicals in a protolathe, so you shouldn't use chemicals as a requirement in protolathe recipes!
 2018-04-30 17:41:04 -04:00
Arokha Sieyes
ce5c7619b9 Fix wonky PDA eject messages 
As reported in https://github.com/VOREStation/VOREStation/issues/3611, attempting to eject a cart on a PDA when there's no cart tells you that you can't do that while you're restrained, which isn't very explanatory.
 2018-04-30 15:39:48 -04:00
Arokha Sieyes
ad40c5fb4e Fix signlang being totally broken 
As reported in https://github.com/VOREStation/VOREStation/issues/3584, signlang is totally broken. The reason being is that it uses get_mobs_and_objs_in_view_fast but passes it a mob when it expects a turf.

Also makes two other tweaks: signlang only signs to people 'in' the thing you're 'in' if you're not on a turf (aka lockers, ~stomachs~), and signlang doesn't produce an extra 'X gestures' emote 30% of the time, given that it always produces either the message if they know signlang, or a 'gestures a long message' or whatever if they don't.
 2018-04-30 14:49:31 -04:00
Arokha Sieyes
28c300359b Resolve shower curtain/steam layering issue 
Reported in https://github.com/VOREStation/VOREStation/issues/3594, curtains and steam layer under mobs due to the plane update. This fixes that, and causes them to layer correctly.
 2018-04-30 12:50:47 -04:00
Arokha Sieyes
f0be908e39 Allow cancelling in chem master modals for pills 
Suggested in https://github.com/VOREStation/VOREStation/issues/3604, this adds cancel buttons when creating pills so you can abort the process rather than getting forced to create pills you might have just accidentally clicked the button for and then breaking them back into beakers.

Resolves https://github.com/VOREStation/VOREStation/issues/3604 (Just in case GitHub knows how to cross-repo close issues)
 2018-04-30 11:42:09 -04:00
Mechoid
9dda8cfe92 Power cost decrease on Lights and Shield Diffusers 2018-04-29 20:11:20 -07:00
Neerti
62ce4196e5 Bonus: Make Travis Show the Active Edges 2018-04-29 18:43:02 -04:00
Neerti
be73b8c36a for(var/bad_code in world) 
Removes a very large amount of world loops.
Adds a macro to painlessly generate a global list, and the needed code to modify the list when an object is made or deleted automatically.
Cleans up some commented out code.
 2018-04-29 17:55:04 -04:00
Atermonera
b130f1cea3 Merge pull request #5211 from Anewbe/hidden_late_join 
Hides jobs with the Never pref on late join
 2018-04-28 20:56:25 -07:00
Atermonera
4828319605 Merge pull request #5212 from Woodratt/04252018_POIstage05 
PoI Stage 0.5
 2018-04-28 20:48:30 -07:00
Atermonera
26c46b3ed5 Merge pull request #5208 from Heroman3003/untilted 
Fixed sprites tilting when standing up during crawling
 2018-04-28 20:40:50 -07:00
Neerti
e3e1a7ad9c Upgrades Planetary Weather to vis_contents (#5170) 
* Upgrades Planetary Weather to vis_contents
Makes the weather on Sif use vis_contents instead of overlays, which should fix all weather-related icon issues, and may or may not be faster.
Weather updates instantly now.
Fixes indoor PoIs having outdoor weather.

* Tries to appease Travis
 2018-04-28 20:40:11 -07:00
Neerti
81c19c62a3 Merge pull request #5218 from Mewchild/MC-Snowsuit 
Fixes miners not being able to take supply snowsuit
 2018-04-28 22:10:12 -04:00
Anewbe
31963b9c20 Merge pull request #5221 from ReddeyfishVor/patch-4 
Prevent negative weight events from happening
 2018-04-28 20:32:33 -05:00
Lorwp
1120e53d36 Destroys Drill meta 
Makes screwdriver hand drills not fit in places a normal screwdriver can
 2018-04-28 20:05:19 +10:00
Arokha Sieyes
1d0aeb95bd Increase zealousness of Portable Freezer item whitelist 2018-04-27 20:16:57 -04:00
ReddeyfishVor
3c931ad535 Prevent negative weight events from happening 2018-04-27 17:10:41 -07:00
Leshana
f508841fff Refactor common template HTML for atmospheric scan into its own file. 
As a demonstration of the partials inclusion feature, the HTML for the atmospheric scan screen (which was nearly identical between PDAs and Communicators) was moved into a separate file and then transcluded into both pda.tmpl and communicator.tmpl
Also added a README.dm with the very basics of nanoui and template transclusion, and fixed comments in nano_state.js
 2018-04-27 14:42:42 -04:00
Atermonera
c8d2f47f06 Merge pull request #5210 from VOREStation/pol-circuitexp 
Fixes an exploit with circuit printers
 2018-04-27 11:12:46 -07:00
Mewchild
78efe65c1c Fixes miners not being able to take supply snowsuit 2018-04-27 12:12:24 -05:00
Leshana
b60281e19a Revert "Nanoui now supports use of multiple templates (#5105)" 
This reverts commit a2841ce9d6.
It turns out nanoui already supports multiple templates.
 2018-04-27 11:36:03 -04:00
Leshana
a8074330f7 POLARIS: Cleanup mineral processing unit 
Convert those spawn() in New() to use initialize() instead.
Convert hard coded state numbers to use define constants.
 2018-04-27 09:50:38 -04:00
Leshana
f8b2d3e4d6 Alternative way to avoid tooltips on mimics. 2018-04-27 09:49:02 -04:00
Leshana
d05163baba Fix missing descriptions on guns. 
examine() is supposed to return a value, these ones did not.
 2018-04-27 09:48:43 -04:00