cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-09 17:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,671 Commits 26 Branches 2 Tags
792f3ada27f11ab02128ea8d2e79a176a8d997d4
Commit Graph

28024 Commits

Author SHA1 Message Date
Ansari
792f3ada27 Fixes spacing 2018-05-18 07:05:05 +08:00
Ansari
2e870f8038 Remove all instance of bombers. Replace "bomber list" in secrets with "bombs" in investigate. Remove useless clear bomb function. 2018-05-17 23:14:29 +08:00
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
4b50938b3d Merge pull request #8355 from Aurorablade/DatumAntag 
Datum Antags: Base
 2018-05-15 18:49:00 -04:00
Fox McCloud
4c1dc7dea7 Merge pull request #9017 from Tayyyyyyy/punpun 
Restore Pun Pun
 2018-05-15 17:59:57 -04:00
Aurorablade
c205f2662d Comments 2018-05-15 16:51:01 -04:00
Tayyyyyyy
8a8f244d3f Remove unneeded args 2018-05-15 01:15:27 -07:00
Aurorablade
5d3ce2ac22 compiles 
and removes shit we do not support yet.
 2018-05-15 02:08:54 -04:00
Aurorablade
3c587ebad5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DatumAntag 2018-05-15 01:40:44 -04:00
Aurorablade
ddb2305ddd updates to TG latest 
hopefully addressing alot of fox commits..now i got to update the branch...
 2018-05-15 01:40:15 -04:00
Tayyyyyyy
fea1dada3a Restore Pun Pun 2018-05-14 22:31:05 -07:00
Crazy Lemon
3e4dbaf9c1 Merge pull request #9014 from Fox-McCloud/remove-dem-oldies 
Removes A Bunch of Old, Unused Files
 2018-05-14 17:55:12 -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
f2bc448d02 comments 2018-05-14 20:09:51 -04:00
Fox McCloud
c5cbb0414a Fixes Basilisk Projectiles 2018-05-14 19:27:43 -04:00
Fox McCloud
ab780b3acf Removes A Bunch of Old, Unused Files 2018-05-14 06:40:48 -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
tigercat2000
f5961c3ff7 Merge pull request #9009 from Fox-McCloud/oh-gosh 
Potential Powernet Fix
 2018-05-11 17:34:05 -07:00
Fox McCloud
08bf86a169 Potential Powernet Fix 2018-05-11 20:26:25 -04: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
07c6ce565d Styling -> Use occupant instead of usr 2018-05-11 07:41:54 +08:00
Ansari
7038610aff Log mech renaming 2018-05-10 21:47:58 +08: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
8c6c26f96d Merge pull request #8994 from Tayyyyyyy/pinpointer_runtimes 
Fix pinpointer runtimes
 2018-05-09 11:23:05 -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
Tayyyyyyy
7255ca373f Fix pinpointer runtimes 2018-05-08 15:25:19 -05: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
Kyep
0aa1174c99 ERT runtimes 2018-05-06 21:48:09 -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
Tayyyyyyy
917c4cb4d4 Fix ERT cloning incorrectly 2018-05-04 15:47:22 -05: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
31a2687fb6 Merge pull request #8958 from Tayyyyyyy/abduction_surgery_fix 
Abduction surgery fix
 2018-05-02 03:41:50 -04:00