cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-04 22:52:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,392 Commits 26 Branches 2 Tags
b72b2c8a5f0271da5aed9b5a03cc7643a07ab6d1
Commit Graph

14316 Commits

Author SHA1 Message Date
KasparoVy
7a7ad57271 Conflict Resolution 2016-09-03 21:45:48 -04:00
Fox McCloud
778d8909f9 Merge pull request #5592 from TheDZD/leapnerf 
Makes Shields Counter Xeno Leap More Effectively
 2016-09-03 20:22:45 -04:00
TheDZD
832983a54d Oh god no I'm using the webclient for this 2016-09-03 20:08:50 -04:00
Fox McCloud
06c144648c Merge pull request #5505 from Ty-Omaha/TacticoolFluff 
Adds Fluff Item "Tacticool EyePro"
 2016-09-03 19:38:51 -04:00
Fox McCloud
8ca806f9c8 Merge pull request #5531 from FlattestGuitar/hakivoxbirbajvosijdprjopjfpiasjdpgjsipdhowdoivoxskreeeeeeee 
Fluff item - Kakicharakiti's hat and thermonocle
 2016-09-03 19:38:39 -04:00
Krausus
364a257cd3 Fixes species restrictions on non-equipment slots 2016-09-03 18:19:00 -04:00
Fox McCloud
4eb1aff523 Merge pull request #5551 from IcyV/BottleFixes 
Makes bottles not as terrible
 2016-09-03 13:24:40 -04:00
Ataman
d6cb3e4e0b Adds a sound file played on pinging the posibrain. (#5603) 
* Adds sound file posiping.ogg

* Adds proc call to play posiping on ping

* reduced volume a bit

* Checking the mark helps...
 2016-09-03 13:23:12 -04:00
KasparoVy
1826f9f174 Adds a Science beret. Obtainable via the loadouts system. 2016-09-03 06:33:22 -04:00
KasparoVy
6f1b3bce2f Aligns the reagent bottles as they used to be, corrects an issue with filler image and the base bottle icon_state. 2016-09-02 02:10:52 -04:00
monster860
58f8d7ec9b Fix hotel SNPC's getting access they shouldn't. 2016-09-01 17:34:51 -04:00
TheDZD
f351e40f0c Makes shields counter xeno leap more effectively 2016-09-01 11:34:00 -04:00
Fox McCloud
9bbd2b0037 Merge pull request #5584 from Crazylemon64/adminjoin_runtime_fix 
Fixes several null `to_chat`s
 2016-08-31 16:34:13 -04:00
Fox McCloud
c07609cd5b Merge pull request #5583 from Krausus/AISpawningFixes 
AI Spawning Fixes
 2016-08-31 16:33:27 -04:00
Crazylemon64
9f4d43b080 BEHOLD MY POWERS OVER LIFE AND DEATH 
(ports over the fix for infinite death when bleeding,
and updating your health doll when you come back from the dead)
 2016-08-31 11:02:54 -07:00
Crazylemon64
bc6da3082d Fixes a runtime when a null memo would be attempted to be 
displayed to an admin

Null descriptions will no longer `to_chat`

KA now no longer runtimes
 2016-08-31 00:27:09 -07:00
Krausus
dc1b51a1ef AI spawning fixes 2016-08-31 02:53:17 -04:00
Fox McCloud
52a9a69509 Merge pull request #5577 from Krausus/SecHudFix 
Fixes SecHUD Icons Not Updating Upon Equipping an ID
 2016-08-30 01:33:59 -04:00
Krausus
cd4cb5df0a Fixes wound cleanup timer runtime 2016-08-30 01:23:37 -04:00
Krausus
c746892528 Fixes sec hud icons not updating on ID equip 2016-08-30 01:04:06 -04:00
Fox McCloud
53893e2b57 Merge pull request #5571 from TheDZD/why-the-fuck-was-this-fucking-proc-made-with-the-fucking-args-backwards-of-literally-every-other-fuckmothering-codebase 
add_logs() Un-fuckery
 2016-08-29 19:36:56 -04:00
TheDZD
f5577b4a8f add_logs() un-fuckery 2016-08-29 17:27:56 -04:00
TheDZD
12734e9105 Merge pull request #5564 from TullyBurnalot/AppendixFeex 
Appendicitis Fix
 2016-08-28 11:15:50 -04:00
TheDZD
a00a7605f8 Merge pull request #5560 from Fox-McCloud/drone-fix 
Drone Door Fix
 2016-08-28 11:15:17 -04:00
TullyBurnalot
13c6df5b38 Appendix-less mobs cannot contract appendicitis 2016-08-28 14:37:08 +01:00
Fox McCloud
ec7e48c52e Merge pull request #5561 from TheDZD/additional-choice 
Minor Bookcase Fix
 2016-08-28 00:54:57 -04:00
TheDZD
93198cccf0 Bookcase Fix 2016-08-28 00:35:50 -04:00
KasparoVy
0b77f70ef0 Fixes a couple bugs, resolves some issues, re-adds a few more bottle choices. 2016-08-27 23:42:31 -04:00
Fox-McCloud
ed82d49864 Drone Door Fix 2016-08-27 23:39:29 -04:00
TheDZD
67d114381b Merge pull request #5553 from Crazylemon64/improved_vv 
Faster VV, VV by ref
 2016-08-27 22:25:14 -04:00
KasparoVy
4481caa39b Switching to underlays. 2016-08-27 21:38:26 -04:00
IcyV
be223511b9 A few more tweaks and updates. 
Most of this can be attributed to KasparoVv
 2016-08-27 07:46:39 -07:00
KasparoVy
6efd9efdfe bottle filler icon handling and nanoui fixes 2016-08-27 04:02:11 -04:00
Fox McCloud
4f590f27c4 Merge pull request #5537 from Crazylemon64/debug_log_to_error_viewing 
Moves from `log_debug` to `log_runtime` for non-fatal abberant states
 2016-08-26 21:15:31 -04:00
Crazylemon64
666a2f15fa Fixes minor formatting gripes 2016-08-26 17:07:01 -07:00
Crazylemon64
50e0a9ee27 Adds a "VV by ref" proc to let people VV by a ref string 
Also moves "Toggle debug verbs" from mapping.dm to its own file,
because that last place made no sense for it
 2016-08-26 16:29:46 -07:00
IcyV
a2af7ac8ab Makes bottles not as terrible 
Previously, the brown rbottles found in chemical lockers were stuck as
brown forever. Now they actually display the chemical inside of them.

The bottles for items such as morphine or toxins that you could get from
vendors always had a specific bottle that never updated based on
chemical or volume. These have new bottles and properly work now.

![bottle images](http://puu.sh/qOWuN/d1a23bf6ed.png)

Much thanks to FullOfSkittles for the bottle sprite and KasproVv for
pretty much most of getting this worked out.

🆑 IcyV
add: Adds new bottle sprite
fix: Fixes many bottles being locked to a single icon
/🆑
 2016-08-26 03:51:55 -07:00
Fox McCloud
8cd9e4864b Merge pull request #5522 from Crazylemon64/airlock_wire_runtime_fix 
Fixes a runtime when an airlock set to `autoclose` is deleted
 2016-08-25 22:55:59 -04:00
Fox McCloud
931937b06b Merge pull request #5545 from Krausus/SwapFormFixes 
Changeling Swap Form-Related Fixes
 2016-08-25 22:54:54 -04:00
TheDZD
b20c0d6e6a Merge pull request #5544 from Fox-McCloud/simple-animal-fix 
Simple Animals Resting Refactor
 2016-08-25 22:54:24 -04:00
Fox-McCloud
9c8b2b624d tweaks 2016-08-25 08:17:00 -04:00
Krausus
9bba0a7342 Changeling Swap Form-related fixes 2016-08-25 04:24:27 -04:00
Fox-McCloud
04e9bb6814 Simple Animals Resting Refactor 2016-08-25 01:41:01 -04:00
Fox McCloud
0e657cff37 Merge pull request #5534 from Crazylemon64/timeofdeath_consistency 
timeofdeath is now set and used consistently
 2016-08-24 20:58:30 -04:00
Crazylemon64
4e4215391a D: 2016-08-24 10:25:56 -07:00
Crazylemon64
16dd4e9d21 Moves many uses of log_to_dd to log_runtime, to make the output 
more visible at runtime, to someone who isn't watching DD first-hand
 2016-08-24 09:55:19 -07:00
Fox McCloud
dbc126b9c9 Merge pull request #5535 from Crazylemon64/i_hope_you_like_giant_prs 
Fixes various bugs
 2016-08-24 00:06:38 -04:00
Crazylemon64
b633cf53af Moves from log_debug to log_runtime for non-fatal abberant states 2016-08-23 17:03:52 -07:00
Crazylemon64
ed850342e7 timeofdeath is now set and used consistently 2016-08-23 16:22:00 -07:00
Crazylemon64
03b7d1b3a9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_transition_runtime_fix 2016-08-23 13:41:39 -07:00