cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-05-28 01:26:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,190 Commits 14 Branches 2 Tags
2a0733a008305cabd976e28b4d3aef92071d90a4
Commit Graph

8313 Commits

Author SHA1 Message Date
Crazy Lemon fc60131d5d Merge pull request #9166 from alexkar598/this-will-burn-ais-down-to-the-ground 
Ais can no longer be on fire
 2018-07-03 12:47:38 -07:00
alexkar598 c391e4d823 you want those true and false? 2018-07-02 15:37:14 -04:00
alexkar598 7fafde8102 Update ai.dm 2018-07-02 15:32:41 -04:00
alexkar598 dc47c9d62b IT burnnnns 2018-07-02 14:40:03 -04:00
Fox McCloud 9eefe326c8 Merge pull request #9140 from Crazylemon64/mmi_radio_upgrade 
MMI radio upgrade
 2018-07-01 22:19:18 -04:00
Crazylemon64 be4a1e426d Adds a radio MMI upgrade module, printable in the mech fab 
Can be uninstalled with a screwdriver
 2018-06-24 13:32:36 -07:00
Crazylemon64 4fec0d6b0a Small refactor of posibrain to keep things clean 2018-06-24 09:45:35 -07:00
tigercat2000 27841fdd5a Merge pull request #8895 from matt81093/death_squid 
Death Squid hitbox adjustment
 2018-06-22 00:09:02 -07:00
Kyep b65c84cd13 fixes can_vote runtime 2018-06-14 03:05:13 -07:00
Kyep 412341439a Fixes #8954 - splits 'attack log' preference, spam-be-gone (#8992) 
* Fixes #8954

* projectile reagetns

* removes all attack logs on keyless simple_animals even by keyed mobs

* deletes 'potentially'

* Tiger request

* more comprehensive solution

* check for mob

* istype

* brevity

* Split attack logs preference

* toggle

* deletes old CHAT_ATTACKLOGS

* explains what levels do when toggling them

* clarification

* Tigercat requests
 2018-06-13 16:55:21 -07:00
tigercat2000 4e758344d3 Merge pull request #9050 from Fox-McCloud/weather-subsystem 
Converts and Updates Weather Subsystem
 2018-06-13 16:08:02 -07:00
tigercat2000 cb3627e6af Merge pull request #9066 from Fox-McCloud/pain-refactor 
Pain Refactor and Tweaks
 2018-06-13 14:24:53 -07:00
tigercat2000 32f7e22005 Merge pull request #9080 from Fox-McCloud/medbot-clean-up 
Cleans Up Medibot Code, Re-Allows Syndicate Medibot
 2018-06-13 13:57:05 -07:00
Fox McCloud 5fb13096a2 Merge remote-tracking branch 'upstream/master' into weather-subsystem 
# Conflicts:
#	code/__DEFINES/layers.dm
 2018-06-13 16:56:19 -04:00
tigercat2000 bd29f7db83 Merge pull request #9076 from Fox-McCloud/speaking-medibot 
Ports Talking Medibot
 2018-06-13 13:55:23 -07:00
tigercat2000 705b56eb4e Merge pull request #9006 from Kyep/login_logout_attack_log 
Adds login/logout to attack logs
 2018-06-13 13:30:41 -07:00
tigercat2000 70b1477133 Merge pull request #9070 from Fox-McCloud/plastic-surgery 
Adds Plastic Surgery; Fixes Disfigurement
 2018-06-13 13:20:00 -07:00
tigercat2000 a3dc1b5468 Merge pull request #8765 from DesolateG/ROBOEDNO 
Fixes ED-209 and floorbot + changes to ED-209 behavior.
 2018-06-08 12:22:35 -07:00
tigercat2000 56d78c433d Merge pull request #7285 from Aurorablade/RingRingHello 
Ring! Ring! Hello?
 2018-06-06 00:19:07 -07:00
Crazy Lemon 1c516292ef Merge pull request #8900 from Kyep/ts_map_fix 
Terror Spider away mission pipes & vents
 2018-06-05 11:39:06 -07:00
Aurorablade cbf8db9097 Merge pull request #27 from tigercat2000/ai_eye_refactors 
A handful of aiEye refactors
 2018-06-05 00:38:41 -04:00
tigercat2000 a90a2176e7 A handful of aiEye refactors 2018-06-04 21:29:35 -07:00
Aurorablade fbfefdce0d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RingRingHello 2018-06-05 00:15:42 -04:00
Fox McCloud 482904befc Merge pull request #9086 from tigercat2000/spacemandmm_fixes 
Macro Refactor for SpacemanDMM
 2018-06-03 19:45:33 -04:00
Fox McCloud d09cff7128 tweak 2018-06-03 19:07:02 -04:00
Fox McCloud 7f2f766f70 Merge remote-tracking branch 'upstream/master' into attack-hulk 
# Conflicts:
#	code/game/objects/structures/window.dm
 2018-06-03 18:49:44 -04:00
uraniummeltdown 75bded82cf added defines for window construction states and full window diagonal dir 
added a proc to check for valid window location, added var/fulltile to windows instead of using a proc
added clockwork windoors and windows to brass recipes
added titanium glass and plastitanium glass, made glass types use recipes like other stacks, you can smelt the new glasses in the ORM
removed force from RCD and added NOBLUDGEON flag, fixing a bug where you couldn't deconstruct airlocks with an RCD
slight nerf to wielded fireaxe, does high damage to windows and grilles instead of insta-deleting them
deleted fullwindow.dm and moved windows to window.dm
added some feedback to placing glass on grilles
examining windoor assembly shows you can rotate it, examining windows show deconstruction hints and rotation
added cracks to windows, you can repair windows using a welding tool on help intent, slight buff to window health
added var/cancolor to windows and blacklists some windows from being auto-colored, window shards also get colored on narsie_act()
full windows now use icon smoothing system, windows now use the obj_integrity damage system
added is_glass_sheet() helper
 2018-06-03 13:11:37 +04:00
tigercat2000 5ace5944d9 Remove bad #undef's and conflicting macros for SpacemanDMM to stop throwing warnings 2018-05-31 19:34:47 -07:00
FalseIncarnate 18a0ff541e Better solution 
Repathed the point decal to the temp_visual effects path. This path has
built-in singularity resistance, and allows me to remove a spawn in
favor of a built-in QDEL_IN call

Also changed points from using the magic number 16 to POINT_LAYER for
their layer definition. This does technically drop the point by 4 layers
(POINT_LAYER is 12), placing them now below the light layer (shouldn't
affect anything) instead of just above it.
 2018-05-30 21:55:26 -04:00
Fox McCloud b17d7ad335 Merge remote-tracking branch 'upstream/master' into plastic-surgery 2018-05-30 11:44:06 -04:00
Fox McCloud 202fbe92fb Cleans Up Medbot Code, Re-Allows Syndicate Medbot 2018-05-29 12:15:04 -04:00
Kyep b48a2b5ee6 Merge remote-tracking branch 'ParadiseSS13/master' into ts_map_fix 2018-05-27 15:36:19 -07:00
Fox McCloud 9fc41ca580 Ports Talking Medibot 2018-05-27 18:02:07 -04:00
Fox McCloud e9c4568c4f tweaks 2018-05-27 14:15:14 -04:00
Alffd f83e8b6aa7 Fix no ToS error 2018-05-26 19:08:53 -04:00
tigercat2000 baf5fe64a7 Merge pull request #8967 from Tayyyyyyy/pronouns 
Pronouns!
 2018-05-25 19:39:11 -07:00
tigercat2000 a1d2261970 Merge pull request #9071 from Allfd/tos 
Terms of service
 2018-05-25 19:38:22 -07:00
Tayyyyyyy bc977804de Small fixes 2018-05-25 18:39:38 -07:00
Tayyyyyyy 96be9a80ea Missed a t_him 2018-05-25 18:39:38 -07:00
Tayyyyyyy 0ee6cde88e Fix a few style issues 2018-05-25 18:39:38 -07:00
Tayyyyyyy 919bd7aaf2 Replace \his, \he, \him, \himself 2018-05-25 18:39:37 -07:00
Tayyyyyyy 09fb007cfc Fix examine 2018-05-25 18:34:29 -07:00
Tayyyyyyy 98c6ddf5a7 Fix his, he, him 2018-05-25 18:34:28 -07:00
Tayyyyyyy aa9d658847 Them 2018-05-25 18:34:28 -07:00
Tayyyyyyy 42f85919de More their 2018-05-25 18:34:26 -07:00
Tayyyyyyy ad23362781 Death 2018-05-25 18:34:24 -07:00
Tayyyyyyy bc210f595b Examine 2018-05-25 18:34:24 -07:00
Tayyyyyyy e6ead787c4 Use get_visible_gender 2018-05-25 18:34:23 -07:00
Tayyyyyyy c80704e724 Conjugating verbs is hard 2018-05-25 18:34:23 -07:00
Tayyyyyyy 170266d827 More pronouns 2018-05-25 18:34:23 -07:00