cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-28 03:01:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,867 Commits 26 Branches 2 Tags
ea119a98dfd71b37852a2babd2eef99b1772e178
Commit Graph

5204 Commits

Author SHA1 Message Date
Fox-McCloud
c65f47707b Merge pull request #1807 from Markolie/globalassetcache 
Update start of game logging, add global asset cache
 2015-08-22 16:06:04 -04:00
Markolie
aa9b5a6310 Implement /vg/'s global asset cache 2015-08-21 18:47:00 +02:00
Markolie
eb2d2b6df9 Another dsay fix 2015-08-20 21:13:17 +02:00
Markolie
d556608225 dsay fix 2015-08-20 20:58:54 +02:00
TheDZD
639478ace5 Merge pull request #1777 from Markolie/malf 
Malf AI update
 2015-08-20 11:50:19 -04:00
Markolie
1e5d0ef4c8 Fix compile 2015-08-20 17:31:49 +02:00
Markolie
87570fc080 isNonCrewAntag() checks, key_name fixes 2015-08-20 17:25:55 +02:00
Fox-McCloud
f635d9c054 Merge pull request #1778 from Markolie/events 
Revenant update, event weight tweaks
 2015-08-19 17:04:14 -04:00
TheDZD
2248b3eaa6 Merge pull request #1760 from Markolie/ipcmasterrace 
IPC overhaul
 2015-08-19 11:57:04 -04:00
Fox-McCloud
1f7bfe92be Merge pull request #1781 from Markolie/adminbus 
Admin teleport update, further admin message fixes
 2015-08-18 20:19:55 -04:00
Fox-McCloud
5be7884143 Merge pull request #1774 from Markolie/tcomms2 
AI tracking update
 2015-08-18 20:18:04 -04:00
Markolie
4b3b9f57b0 Remove NO_POISON from golem/shadow 2015-08-19 01:30:35 +02:00
Markolie
473dcbead5 Remove IPC toxin immunity for now 2015-08-18 21:54:58 +02:00
Markolie
6576c02a71 More revenant updates 2015-08-18 21:06:48 +02:00
Markolie
bbc249172c Fix see_override, add uses to lockdown 2015-08-18 20:56:21 +02:00
Markolie
8086d61042 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into malf 
Conflicts:
	code/game/objects/items/devices/aicard.dm
 2015-08-18 20:24:10 +02:00
Markolie
80360fd8a9 Malf AI update 2015-08-18 20:22:38 +02:00
Markolie
8bede1db99 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ipcmasterrace 
Conflicts:
	code/modules/mob/living/simple_animal/friendly/fox.dm
	code/modules/organs/organ_alien.dm
 2015-08-18 18:38:59 +02:00
Markolie
a8f8fb160a Revenant update 2015-08-18 18:29:45 +02:00
Markolie
6bb7372ace Logging/ghost messages for various whispers 2015-08-18 18:15:49 +02:00
Krausus
f816b8672d Resolves merge conflicts 
Conflicts:
	code/game/machinery/computer/communications.dm
 2015-08-18 04:14:14 -04:00
Krausus
a1cc629f6e Gives constructs universal_speak 
This allows them to actually communicate with humans, rather than just
causing runtimes.
 2015-08-18 03:38:47 -04:00
Krausus
621341317d Fixes AI power supplies runtiming after deletion 2015-08-18 01:43:45 -04:00
Krausus
c3ec8d63f8 Fixes AI late-joins not deleting the inactive core 2015-08-18 01:34:15 -04:00
Fox-McCloud
e618f79418 Merge pull request #1768 from Markolie/diona 
Turn diona nymphs into simple animals
 2015-08-17 21:34:46 -04:00
Markolie
4e8bb6d301 Admin teleport update, further admin message fixes 2015-08-18 00:54:25 +02:00
Fox-McCloud
333e7fe236 Merge pull request #1766 from Markolie/adminbus 
Admin jump overhaul, add watchlist functionality, other admin updates
 2015-08-17 18:10:38 -04:00
Fox-McCloud
6d9e64b42b Merge pull request #1775 from Markolie/cult 
Cult loyalty implant fix, other fixes
 2015-08-17 17:12:46 -04:00
Markolie
a15097f6fb Revenant update, event weight tweaks 2015-08-17 22:08:25 +02:00
Markolie
c91e698e24 Fix shuttle call sanitization 2015-08-17 21:20:00 +02:00
Markolie
487b73049f Sanity check 2015-08-17 21:08:55 +02:00
Markolie
c688fd1c52 Add resting animations for syndifox, syndicat, cats and dionas 2015-08-17 21:07:19 +02:00
Markolie
c991406355 Hostile lockdown nerf 2015-08-17 20:30:19 +02:00
Markolie
dc76ff1ae5 Fix targets 2015-08-17 20:03:57 +02:00
Markolie
417c7ced5f Bug fixes 2015-08-17 19:54:22 +02:00
Markolie
d8b5afeca7 Cult loyalty implant fix 2015-08-17 19:24:21 +02:00
Markolie
8822cbba09 AI tracking update 2015-08-17 19:05:09 +02:00
Mark van Alphen
33631beaf8 Merge pull request #1740 from tigercat2000/underwear_refactor 
-tg- underware overhaul
 2015-08-17 17:37:50 +02:00
Markolie
7dc1b6ee93 attack_sound fix 2015-08-17 02:25:55 +02:00
Markolie
766b0c979f Turn dionas into simple animals 2015-08-17 02:19:29 +02:00
Markolie
8af3c8c47a Final fixes/mech attack update 2015-08-17 00:32:50 +02:00
Markolie
6a5ceb10b1 Fix compile error 2015-08-17 00:15:19 +02:00
Markolie
5eee617063 Consolidate ?/FLW links under key_name_admin 2015-08-17 00:13:53 +02:00
Markolie
a397c730b5 Admin jump overhaul, add watchlist functionality, other admin updates 2015-08-16 23:28:02 +02:00
Mark van Alphen
6abb1f8730 Merge pull request #1754 from tigercat2000/log_to_dd 
New proc to replace world.log <<, log_to_dd()
 2015-08-16 17:49:00 +02:00
Markolie
4a14a97b3b IPC overhaul part deux 2015-08-16 02:34:52 +02:00
Markolie
e6408b96c2 IPC overhaul 2015-08-15 23:52:26 +02:00
Fox-McCloud
df1a05550d Merge pull request #1750 from Markolie/shuttle 
Flavor text encoding fix
 2015-08-15 15:16:20 -04:00
Fox-McCloud
1e88bc6712 Merge pull request #1742 from Markolie/ghosties 
Ghost/admin ghost machinery interaction
 2015-08-15 15:16:10 -04:00
Fox-McCloud
9e882aa22a Merge pull request #1739 from Markolie/clicking 
You can now click on an inventory slot instead of a specific item
 2015-08-14 21:32:37 -04:00