cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-02 13:42:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,867 Commits 26 Branches 2 Tags
ea119a98dfd71b37852a2babd2eef99b1772e178
Commit Graph

1728 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
TheDZD
639478ace5 Merge pull request #1777 from Markolie/malf 
Malf AI update
 2015-08-20 11:50:19 -04:00
Markolie
87570fc080 isNonCrewAntag() checks, key_name fixes 2015-08-20 17:25:55 +02:00
Markolie
286d2301f4 Replace disabling RCD's with exploding them 2015-08-20 01:29:23 +02: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
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
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
Markolie
8822cbba09 AI tracking update 2015-08-17 19:05:09 +02:00
Markolie
381c3f0c92 Consistent bomb logging 2015-08-17 01:01:30 +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
Markolie
d607739078 Final IPC fixes (hopefully) 2015-08-16 03:43:20 +02:00
Markolie
4a14a97b3b IPC overhaul part deux 2015-08-16 02:34:52 +02:00
Fox-McCloud
3fecd07249 Minor Genetics Balance 2015-08-15 18:19:51 -04:00
Markolie
e6408b96c2 IPC overhaul 2015-08-15 23:52:26 +02: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
Markolie
85c4b99973 You can now click on an inventory slot instead of a specific item 2015-08-14 01:39:28 +02:00
Markolie
0598ebecb9 Remove unused variable causing a warning 2015-08-13 20:25:49 +02:00
Fox-McCloud
1cce7c87be Merge pull request #1716 from Markolie/rndserver 
Give syndi toolbox insulated gloves
 2015-08-12 22:27:53 -04:00
Fox-McCloud
427a4437e8 Merge pull request #1713 from Markolie/master 
Fixes
 2015-08-12 17:37:22 -04:00
Markolie
362a817d79 Runtime and bug fixes 2015-08-12 18:20:53 +02:00
Markolie
d1e776a8f2 Give syndi toolbox insulated gloves 2015-08-12 02:26:21 +02:00
Markolie
94044e6f76 Whoops 2015-08-11 22:26:29 +02:00
Markolie
27d305522b Add barber hud icon, add unique ID card for supervisors 2015-08-11 22:24:38 +02:00
Fox-McCloud
7a24a015bc ID Fixups 2015-08-10 18:36:26 -04:00
Markolie
99c7bbed55 Add card skin descriptions, let agent ID's change photo, re-add photos and job blacklist update 2015-08-10 16:00:58 +02:00
Markolie
63bff3e31d Fix double attack_self message 2015-08-10 04:29:17 +02:00
Markolie
fe512b3776 Add slot removal/additions on identification computers 2015-08-10 02:58:00 +02:00
Markolie
c9ed5fe5bc Fix typo 2015-08-09 23:46:40 +02:00
Markolie
034cf8ef69 ID card/agent ID rework 2015-08-09 23:42:55 +02:00
Fox-McCloud
c3ad070066 Ports over Airhorns 2015-08-06 00:42:17 -04:00
Fox-McCloud
fc8b310d2d Baton Fixes and Cattleprod Buff 2015-08-03 21:12:29 -04:00
Markolie
f213cf5501 Fix cable coil sprite 2015-08-03 06:37:12 +02:00
Fox-McCloud
1ee7853d65 Merge pull request #1476 from TheDZD/mining2 
Mining Overhaul [Soon™]
 2015-07-29 20:51:24 -04:00
Fox-McCloud
e517d172be Banana Grenade Fix 2015-07-28 21:44:46 -04:00
Fox-McCloud
eb694a50eb Updates Nuke Disk Spawning 2015-07-24 17:33:25 -04:00
DZD
66688f4dbb Fixes conflicts in icons/obj/gun.dmi. 2015-07-24 15:29:20 -04:00
Fox-McCloud
0945859066 Merge pull request #1554 from Markolie/master 
Fix OneHuman law
 2015-07-22 16:57:23 -04:00
Markolie
4cfd1e4340 Fix OneHuman law 2015-07-22 18:35:09 +02:00
SamCroswell
d84dfe5a49 ERT Rework - Code Changes 2015-07-20 19:37:56 -04:00
DZD
29e70854e9 Fix merge conflicts 
🖕 map conflicts over lines that weren't even edited by both upstream
and this branch.
 2015-07-15 22:28:12 -04:00
Fox-McCloud
e4d6acb538 Changes a few del to del() 2015-07-10 23:28:08 -04:00
DZD
412443dbf1 Fix non-icon merge conflicts 2015-07-10 19:57:59 -04:00
DZD
d4cf433e7c Various fixes, changes, additions, and removal of old features. 
More changes
 2015-07-10 19:41:27 -04:00