cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-05 23:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,671 Commits 26 Branches 2 Tags
a135d0183522948e6d2ff6201a54e4bde7459d7c
Commit Graph

17354 Commits

Author SHA1 Message Date
Fox McCloud
709f2b5ff6 Merge pull request #9004 from Anasari/BotLogging 
Naming bots is now logged
 2018-05-15 22:06:46 -04:00
Fox McCloud
4c1dc7dea7 Merge pull request #9017 from Tayyyyyyy/punpun 
Restore Pun Pun
 2018-05-15 17:59:57 -04:00
Tayyyyyyy
8a8f244d3f Remove unneeded args 2018-05-15 01:15:27 -07:00
Tayyyyyyy
fea1dada3a Restore Pun Pun 2018-05-14 22:31:05 -07:00
Crazy Lemon
63ec546a0a Merge pull request #9008 from Fox-McCloud/remove-mode 
Removes All Modes
 2018-05-14 17:49:58 -07:00
Fox McCloud
042ee7b77b comments 2018-05-14 20:40:39 -04:00
Fox McCloud
c5cbb0414a Fixes Basilisk Projectiles 2018-05-14 19:27:43 -04:00
Ansari
69cefb7f3c Actually fix usr to user and compile 2018-05-12 10:28:26 +08:00
Ansari
de818d92ab user instead of usr 2018-05-12 10:14:14 +08:00
Fox McCloud
f521f2765c Removes All Modes 2018-05-11 17:55:45 -04:00
tigercat2000
64a895d6f1 Merge pull request #9003 from Kyep/monkey_business_2 
Fixes snacks.dm runtime and monkey bug
 2018-05-10 19:30:29 -07:00
Ansari
6084f5cfef Log bot 2018-05-10 16:32:34 +08:00
Kyep
e7653b578b Tiger request 2018-05-10 00:06:17 -07:00
Kyep
6c47553fcd Fixes snacks.dm runtime and monkey bug 2018-05-09 23:57:47 -07:00
Tayyyyyyy
6f63e8b4b9 Fix Aurora Caelus spelling and grammar. Fixes #8945 2018-05-09 19:03:49 -05:00
tigercat2000
254cdd6055 Merge pull request #8972 from Fox-McCloud/power-cell 
Power Cell Code Cleanup
 2018-05-09 11:26:03 -07:00
tigercat2000
28c0302fb4 Merge pull request #8991 from RyanSmake/fuckingfaxes 
Fax machines are no longer photocopiers
 2018-05-09 11:23:29 -07:00
tigercat2000
aedece7207 Merge pull request #8989 from Kyep/nations_etc_borg_runtime 
Fixes #8271 - rare borg runtimes
 2018-05-09 11:22:04 -07:00
Fox McCloud
7d4fb45509 Merge pull request #8947 from tigercat2000/more_ss_ports 
SS Conversion: Atoms, Machines, n' Mobs
 2018-05-07 17:54:49 -04:00
ryansmake
f1a71a02fc Fax machines are no longer photocopiers 2018-05-07 22:04:36 +02:00
Kyep
a6d06ea397 Fixes #8271 - rare borg runtimes 2018-05-06 22:21:35 -07:00
tigercat2000
f0f540b839 Merge pull request #8978 from TravellingMerchant/Fluffupdate 
Changes Merchants Fluff item.
 2018-05-06 12:37:29 -07:00
tigercat2000
c78075414c Merge pull request #8488 from Kyep/ds_tweaks 
Tweaks Deathsquad
 2018-05-04 19:03:54 -07:00
Kyep
05e0901967 removes anti-drop implants 2018-05-04 18:36:56 -07:00
tigercat2000
662d7f34e2 Merge pull request #8949 from Kyep/tsf_marines 
Solar Federation Outfit Fixes/Tweaks
 2018-05-04 12:50:38 -07:00
ryansmake
6e846018cd Performs inquisition on ATMs 2018-05-04 19:36:54 +02:00
TravellingMerchant
e812cae73f Updates Merchants Fluff item. 2018-05-04 16:33:00 +01:00
tigercat2000
8071b42308 Merge remote-tracking branch 'upstream/master' into more_ss_ports 
# Conflicts:
#	code/modules/food_and_drinks/food/snacks.dm
 2018-05-03 19:30:41 -07:00
tigercat2000
5243c254ac Update monkey cubes 2018-05-03 19:28:35 -07:00
Kyep
ee538b25d5 Monkey business logging 2018-05-02 17:02:24 -07:00
Fox McCloud
8bd042240f Power Cell Code Cleanup 2018-05-02 19:35:18 -04:00
Fox McCloud
1a00cbdcf9 Actually Fixes Chem Smoke 2018-05-02 00:14:32 -04:00
tigercat2000
0c6cbbc5c3 Merge pull request #8959 from Fox-McCloud/remove-things 
Removes Programmable Unloaders and a Few Unused Files
 2018-05-01 14:07:12 -07:00
tigercat2000
cacde22a27 Readd human/New warning about excessive arguments 2018-04-30 09:36:22 -07:00
tigercat2000
7fb8f8d76c Merge remote-tracking branch 'upstream/master' into more_ss_ports 
# Conflicts:
#	paradise.dme
 2018-04-30 09:27:11 -07:00
Fox McCloud
f28285e16f further checks 2018-04-30 04:42:57 -04:00
Fox McCloud
ee6a156ca2 Removes Programmable Unloaders and a Few Unused Files 2018-04-30 00:41:26 -04:00
tigercat2000
3c1fbf9cc5 Merge pull request #8938 from Fox-McCloud/guillotine 
Ports Guillotine
 2018-04-29 20:28:50 -07:00
Fox McCloud
63e2a175fd Merge remote-tracking branch 'upstream/master' into timer-subsystem 2018-04-29 21:14:11 -04:00
tigercat2000
4f39ee73c8 Merge pull request #8936 from Fox-McCloud/tg-blast-cannon 
Ports TG's Blastcannon
 2018-04-29 18:13:16 -07:00
tigercat2000
2163e43b53 Merge pull request #8957 from Fox-McCloud/fix-plastic 
Fixes Plastic Recipe
 2018-04-29 18:03:41 -07:00
Fox McCloud
c73a6b237d logging 2018-04-29 21:03:31 -04:00
tigercat2000
49195e4f3e Merge pull request #8941 from Anasari/kittyears 
Add kitty ears to load out
 2018-04-29 17:56:19 -07:00
tigercat2000
3271a6270c Merge pull request #8956 from Fox-McCloud/oh-noooo 
Does Surgery on Surgery to Fix Surgery
 2018-04-29 17:55:47 -07:00
Fox McCloud
cd8c38bb40 Fixes Plastic Recipe 2018-04-29 20:54:18 -04:00
Fox McCloud
f7181df136 Does Surgery on Surgery to Fix Surgery 2018-04-29 20:41:37 -04:00
FalseIncarnate
94aa18ceda E.L.O. Fluff Item 
Adds E.L.O.'s fluff item: a personalized medical beret.

Ckey: `V-Force_Bomber`
Character Name: `E.L.O.`
 2018-04-29 12:32:26 -04:00
Kyep
da2122626a TSF marine update 2018-04-29 01:45:13 -07:00
Fox McCloud
278e6a7c25 the last of the TIMER_STOPPABLE 2018-04-29 01:12:57 -04:00
Fox McCloud
510c5b4268 fixes 2018-04-29 00:53:13 -04:00