cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-08 00:21:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,023 Commits 26 Branches 2 Tags
b82393790efdca152e3318bb9dcee2f003e3d2df
Commit Graph

14997 Commits

Author SHA1 Message Date
tigercat2000
f31d79a961 Merge pull request #9064 from Anasari/MoreClickAntag 
One-click antag improvement. Antag-related refactor, memory confirmation & typo fixing
 2018-06-13 18:43:18 -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
20a2594bfc Merge pull request #9046 from Fox-McCloud/wish-granter 
Datumizes Wishgranter
 2018-06-13 16:06:05 -07:00
tigercat2000
cc1cf8a7a8 Merge pull request #8995 from Kyep/job_slot_scaling 
High-Pop Job Slots
 2018-06-13 15:35:44 -07:00
tigercat2000
822775a4ec Merge pull request #9041 from Fox-McCloud/vending-freeeeee 
Adds Free Vending Machines
 2018-06-13 15:05:29 -07:00
Fox McCloud
124f1518ce Merge remote-tracking branch 'upstream/master' into two-handed 
# Conflicts:
#	code/game/objects/items/weapons/twohanded.dm
 2018-06-13 17:29:37 -04: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
910d741382 Merge pull request #9043 from PigeonLord/paraboot 
Added magboots in the Paramedic's EVA Gear closet
 2018-06-13 13:29:39 -07:00
tigercat2000
544c7d0372 Merge pull request #9109 from MINIMAN10000/unlocked-airlock-electronics 
Remove lock on airlock electronics, fix href_list close
 2018-06-13 13:26:22 -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
MINIMAN10000
30b1278bb2 Remove lock on airlock electronics, fix href_list close 2018-06-10 19:41:21 -07:00
Sakura Duff
1071d17eb2 Fixing $freq not working rev2 (#9107) 
* Fixing merge conflicts

* Update broadcaster.dm

* Update broadcaster.dm

* Update broadcaster.dm
 2018-06-10 18:26:31 -07:00
FalseIncarnate
7130ad489d Fixes #9007 
Joined Souls rune now properly summons restrained cultists with 3 or
more invokers.
 2018-06-09 13:58:14 -04:00
tigercat2000
b9a6383188 Merge remote-tracking branch 'upstream/master' into tcomms_optimize 
# Conflicts:
#	code/game/machinery/telecomms/telecomunications.dm
 2018-06-07 15:04:57 -07:00
tigercat2000
40a7b791d0 Merge pull request #8162 from Aurorablade/TheCultOfMimes 
The cult of mimes
 2018-06-07 14:41:23 -07:00
tigercat2000
033c1ddfe4 Merge pull request #8495 from Allfd/airalarmsafemode 
Adds an emergency action check for air alarms
 2018-06-07 14:34:01 -07:00
Fox McCloud
dd6b879546 Merge pull request #8212 from Aurorablade/Walls 
wall shit
 2018-06-06 18:32:23 -04:00
tigercat2000
56d78c433d Merge pull request #7285 from Aurorablade/RingRingHello 
Ring! Ring! Hello?
 2018-06-06 00:19:07 -07:00
Aurorablade
e8089070c6 Spulling r gud 2018-06-06 02:14:13 -04:00
Aurorablade
c71ce6a537 mew 2018-06-06 02:00:52 -04:00
Aurorablade
5a63d6c178 reeeeeeeeeeeee 2018-06-06 00:44:01 -04:00
Aurorablade
2c5788cad6 tigggeerrrrrrrr 2018-06-06 00:04:13 -04: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
9a07b61ac1 TG updates 2018-06-05 00:57:08 -04: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
Aurorablade
064baf7768 Fox Twices. 2018-06-04 23:39:38 -04:00
Aurorablade
94e5143f5e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Walls 2018-06-03 22:59:25 -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
4531bc2337 tweaks 2018-06-03 19:26:48 -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
Aurorablade
2e37b16c48 Fox tweaks 2018-06-02 23:37:11 -04:00
tigercat2000
49e49591a1 Merge pull request #9075 from Anasari/AttackLogImprove 
Improved (ish) attack log logging
 2018-06-01 20:52:42 -07: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
FalseIncarnate
496d4794ad [s] Fixes #9073 
The singulo no longer feeds on attention.
🆑
fix: The singulo no longer feeds on attention.
/🆑
 2018-05-30 21:26:18 -04:00
Fox McCloud
b17d7ad335 Merge remote-tracking branch 'upstream/master' into plastic-surgery 2018-05-30 11:44:06 -04:00
Aurorablade
73860cce46 Patching 2018-05-30 02:32:30 -04:00
Fox McCloud
202fbe92fb Cleans Up Medbot Code, Re-Allows Syndicate Medbot 2018-05-29 12:15:04 -04:00
Tayyyyyyy
def0702ba0 Fix incorrect ERT slots being set 2018-05-27 15:48:29 -07:00
Kyep
b48a2b5ee6 Merge remote-tracking branch 'ParadiseSS13/master' into ts_map_fix 2018-05-27 15:36:19 -07:00
Kyep
2c8d09bc89 air alarm exception/runtime fix 2018-05-27 15:35:21 -07:00
Fox McCloud
e9c4568c4f tweaks 2018-05-27 14:15:14 -04:00
Ansari
ab3a96b1ec Add antag 2018-05-27 20:37:07 +08:00
Fox McCloud
ed9915edd9 Merge remote-tracking branch 'upstream/master' into two-handed 
# Conflicts:
#	code/game/objects/items/weapons/twohanded.dm
 2018-05-26 19:05:17 -04:00