cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 23:51:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,111 Commits 26 Branches 2 Tags
7239fc2c40af60b9b74ee0f9f4e2afa721e2e03a
Commit Graph

4275 Commits

Author SHA1 Message Date
DZD
7239fc2c40 Merge remote-tracking branch 'upstream/master' into pAI-Drone-Port 2015-01-07 15:48:29 -05:00
Markolie
c1b48b40b7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	code/modules/client/preferences.dm
 2015-01-06 23:40:34 +01:00
Markolie
0284c9ce87 And revert the old changes 2015-01-06 22:08:36 +01:00
Markolie
faf90c3fdc Proper drone solution (I shouldn't code at late night) 2015-01-06 22:07:42 +01:00
Markolie
0bf809eae4 Let observers join as drones instantly 2015-01-06 06:47:13 +01:00
Fox-McCloud
b90b9ad8b5 Merge pull request #131 from Markolie/master 
Map fixes, bug fixes
 2015-01-05 22:57:19 -05:00
Markolie
6ce5b379e4 Let AI transmit cryo/arrival messages when present, let AI change arrival message 2015-01-06 02:06:23 +01:00
Fox-McCloud
03c7a72a33 Undershirts 2015-01-05 16:22:47 -05:00
Fox-McCloud
ff2b7cedb2 Clothing Restructuring 2015-01-02 12:40:42 -05:00
Fox-McCloud
43af351d27 Odds and Ends 2015-01-01 21:05:50 -05:00
Fox-McCloud
a92921786f Clothing Update 2015-01-01 11:23:48 -05:00
Fox-McCloud
a90a217290 Xeno Rebalance 2014-12-31 11:16:11 -05:00
Fox-McCloud
525bb1a96f Stun Changes 2014-12-30 12:30:14 -05:00
Fox-McCloud
ff186408ed Malf AI update 2014-12-24 21:23:04 -05:00
Markolie
10a2cda23c Another attempted defib fix 2014-12-24 15:03:56 +01:00
Markolie
78d302614c Antaghud posibrain fix 2014-12-24 14:26:37 +01:00
Markolie
5bb4a3b1fe Minor changes 2014-12-24 13:13:49 +01:00
Markolie
b8332f1e6e Additional autopsy data 2014-12-24 01:29:08 +01:00
Markolie
328fb13704 Attempted defib fix 2014-12-23 17:25:09 +01:00
Markolie
37fba799d6 Radio pain message fix 2014-12-23 01:23:53 +01:00
Markolie
c8db120dce Transit tube pressure fix 2014-12-22 20:31:03 +01:00
Markolie
71a9a358e1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	maps/cyberiad.dmm
 2014-12-22 15:14:35 +01:00
Markolie
47f4161fbb Bug fixes, map fixes 2014-12-22 14:47:58 +01:00
Fox-McCloud
03c61ed3ab Foxes 2014-12-22 08:32:32 -05:00
Markolie
d440784473 Syndicat faction 2014-12-21 20:41:56 +01:00
Markolie
17ae62bc99 Karma refund option, IPC radiation checks 2014-12-20 20:45:31 +01:00
Markolie
da8115dc2e Bug fixes 2014-12-20 16:27:33 +01:00
Markolie
2c79a2f376 Bot fix, add emergency door access 2014-12-19 00:32:32 +01:00
Markolie
50a176571a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	maps/cyberiad.dmm
 2014-12-18 17:13:18 +01:00
Fox-McCloud
53d15682ce Melee Rebalancing 2014-12-18 10:22:02 -05:00
Markolie
19fde1c4a0 Bug fixes 2014-12-17 21:56:37 +01:00
Fox-McCloud
84b9f05149 Xeno Tweaking 2014-12-16 20:26:27 -05:00
Fox-McCloud
fff011e334 Merge pull request #84 from SamCroswell/master 
Buzzsky Icon, Pingsky Hates Humans
 2014-12-16 10:24:19 -05:00
SamCroswell
56f22dbf2d Buzzsky Icon, Pingsky Hates Humans 
Buzzsky now gets an icon that reflects his sorry state, Pingsky now has
anti-human sentiment.
 2014-12-15 20:25:00 -05:00
Markolie
18cd40308d Alien notice fixes 2014-12-15 17:13:08 +01:00
Markolie
ad726006a3 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2014-12-15 12:05:10 +01:00
Markolie
e648bb959e Alien bugfixes 2014-12-15 12:04:30 +01:00
Fox-McCloud
8cec4742d0 Defib Unit 2014-12-15 04:55:02 -05:00
Fox-McCloud
91f456e1f1 Merge pull request #73 from SamCroswell/master 
Weapons No Longer Embed, Minor Map Edits
 2014-12-14 16:52:18 -05:00
Fox-McCloud
78d161742e Healthdoll 2014-12-14 16:43:06 -05:00
DZD
d6e13b506d Possible Fix for pAI language 
- pAIs can speak Sol Common by default (Needs testing)
 2014-12-14 15:49:13 -05:00
DZD
8f92593e4a Fixed pAI Death and Interface While in Drone Form 
- pAI interface now closes when a user tries to interact with it while
the pAI is in drone form or out of range.
- PROPERLY fixed drone pAI death, leaves a corpse on the ground.
 2014-12-14 15:31:30 -05:00
SamCroswell
a82e3d95ee Weapons used at melee range no longer embed. 
Melee weapons will no longer embed when hitting people directly with
them.

Note that items that are thrown and projectiles will still embed as per
their normal behavior.
 2014-12-14 14:00:23 -05:00
Fox-McCloud
fece84d974 Fixes-Tweakes 2014-12-14 03:18:10 -05:00
Markolie
1dda38f659 Larva fix 2014-12-14 03:33:45 +01:00
Markolie
19d6bf8cc4 Armalis armour fix, remove backup from git 2014-12-13 22:03:38 +01:00
Markolie
22eb3e3c29 Bug fixes 2014-12-13 21:53:01 +01:00
Markolie
320f4ee151 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2014-12-13 18:59:25 +01:00
Markolie
6d3f0e8bf4 Bug fixes 2014-12-13 18:59:04 +01:00
Fox-McCloud
8238638283 Gun Harmonization 2014-12-13 11:18:56 -05:00