cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-03-28 07:03:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,722 Commits 12 Branches 2 Tags
39cc526e469e34a3fca02fac99a092c12156d310
Commit Graph

19209 Commits

Author SHA1 Message Date
Aurorablade
39cc526e46 SSHOVE THIS IN YOUR FACE TRAVIS 2015-12-07 00:01:34 -05:00
Aurorablade
5698509581 Heal Delay 2015-12-06 02:38:31 -05:00
Aurorablade
ee607af47e Adds small delay to healer heal clicking. 2015-12-06 02:33:30 -05:00
Aurorablade
16cdea3a2b Changes 
underpred projectile cap
Adds communication changes based on Ponies feedback
 2015-12-05 08:14:28 -05:00
Aurorablade
22d8c8bd93 Raanged guardian click delay 2015-12-05 00:27:26 -05:00
Fox McCloud
dc089e3146 Merge pull request #2712 from Crazylemon64/mecha_mmi_fix 
Mecha mmi Tweaks and Fix
 2015-12-04 19:23:53 -05:00
TheDZD
b0fd240083 Merge pull request #2721 from ZomgPonies/222 
Nations 2.2.2
 2015-12-04 16:05:18 -05:00
ZomgPonies
f7bb7600ac Renamed 2 to DEAD 2015-12-04 15:57:05 -05:00
Crazylemon
6d44983a3e Revert "Testing out a new item declaration syntax" 
This reverts commit b26ed9a950.
 2015-12-04 12:52:31 -08:00
ZomgPonies
78c187254d Fixes #2726 2015-12-04 15:10:20 -05:00
Crazylemon
b26ed9a950 Testing out a new item declaration syntax 
Let me know what you think, I think this would work quite well for
furniture disassembly
 2015-12-04 11:54:38 -08:00
Crazylemon64
9809a5fc1b Lots of cool fixes! Read below! 
- Radio MMIs can now talk on the radio like a regular person does
- Same for MMIs in mechs
- A posibrain in a mecha doesn't lose its ability to hear binary chat
- Mechs now consume power when moving again
- Disassembling mecha wreckage now doesn't have a bunch of annoying "hit
  by" messages
- MMIs in someone's grasp no longer cause a rigsuit-related runtime
 2015-12-03 23:46:10 -08:00
Fox McCloud
4a328a2d76 Merge pull request #2715 from Aurorablade/GuardianStuff 
Guardian Fixes/tweaks
 2015-12-04 00:14:39 -05:00
Aurorablade
96e3f1a1b9 URK 2015-12-03 23:57:29 -05:00
ZomgPonies
6e67dfd33a Fixes borg issues 2015-12-03 18:06:49 -05:00
Fox McCloud
a4b36540d8 Merge pull request #2706 from Crazylemon64/reclaimer_plasglass 
Lets the ore reclaimer make plasma glass from plasma and glass
 2015-12-03 17:43:11 -05:00
Aurorablade
ec61de0a20 Star Fox told me some things i couldn't do..i fixeded them. 2015-12-03 15:11:42 -05:00
Fox McCloud
968bdda181 Merge pull request #2718 from Crazylemon64/cryotube_nodrop_fix 
NODROP beakers won't summon yog-sothoth when placed in a cryo tube now
 2015-12-03 12:41:22 -05:00
Crazylemon
e877609de7 NODROP beakers won't summon yog-sothoth when placed in a cryo tube now 2015-12-03 09:24:36 -08:00
Aurorablade
69e2567e74 Trying to figure outwhy admin version is not working 2015-12-03 02:00:55 -05:00
Aurorablade
6821031ea7 PATCH 2015-12-02 23:47:55 -05:00
TheDZD
3f72596e62 Merge pull request #2612 from Aurorablade/Guardingthings 
Fethas Carnival of Horrors part 4: I am in your greytide guarding ur newbs
 2015-12-02 21:21:22 -05:00
Aurorablade
7d6b6f9436 RAWRRGHHHH 
FUCKING DEBUG PRINT
RAWRRGHHHHRAWRRGHHHHRAWRRGHHHHRAWRRGHHHHRAWRRGHHHHRAWRRGHHHHRAWRRGHHHHRAWRRGHHHH
 2015-12-02 21:06:13 -05:00
Aurorablade
e543062396 PAWNCYPAUNCH 2015-12-02 20:57:32 -05:00
TheDZD
2274c1806d Merge pull request #2696 from ZomgPonies/mecha 
Speech Bubble fixes
 2015-12-02 19:43:47 -05:00
TheDZD
07021e506b Merge pull request #2699 from Fox-McCloud/botany-qol 
Botany QoL Changes
 2015-12-02 19:15:17 -05:00
TheDZD
cd3ce35f07 Merge pull request #2701 from Fox-McCloud/phlog-tweak 
Phlog Nerf/Balance
 2015-12-02 19:15:12 -05:00
TheDZD
cf18c90b94 Merge pull request #2710 from Fox-McCloud/player-spider-fixes 
Player Spider Fixes
 2015-12-02 19:02:23 -05:00
Fox-McCloud
82312c9e52 Player Spider Fixes 2015-12-02 18:14:01 -05:00
Crazylemon
13e2436934 Gives MMI Odysseus' medhuds, adds mech wreckage disassembly 
MMIs can also be extracted without destroying the mech should they
permit maintenance protocols
 2015-12-02 13:30:07 -08:00
Crazylemon
c41140c636 This should let MMI mechs move again 
Need to give this a test, but it looks like the else case of the mecha
check was hijacked by the MMI check, which then prevented brains in a
mech from moving
 2015-12-02 09:30:03 -08:00
Crazylemon
b12ce7eb5a i r a gud pro gammer 2015-12-01 22:48:10 -08:00
Crazylemon
11562a8e03 Lets the ore reclaimer make plasma glass from plasma and glass 2015-12-01 22:19:54 -08:00
ZomgPonies
e793af5719 Adds giving custom rank to heir 2015-12-01 19:31:08 -05:00
Fox McCloud
ca5362f055 Merge pull request #2687 from SvartaSvansen/more-char-setup 
More character setup changes
 2015-12-01 19:21:58 -05:00
ZomgPonies
900f20b9bd I -think- this is what you guys mean? 2015-12-01 19:06:57 -05:00
Fox McCloud
c9c38597ad Merge pull request #2685 from Tastyfish/inputfix 
fixed various inputs to be cancel-able
 2015-12-01 17:56:16 -05:00
TheDZD
f39d78af1d Merge pull request #2702 from ZomgPonies/nations221 
Nations 2.2.1
 2015-12-01 15:03:35 -05:00
ZomgPonies
c7608bdacf Forgot a spare world 2015-12-01 03:44:51 -05:00
ZomgPonies
6e194ca5cf Fixed bugs 2015-12-01 03:29:46 -05:00
Fox-McCloud
afeb0f30ce Phlog Nerf/Balance 2015-12-01 00:32:42 -05:00
Tastyfish
f839b43bcc Merge remote-tracking branch 'origin/inputfix' into inputfix 
Conflicts:
	code/_onclick/hud/screen_objects.dm
	code/game/dna/genes/vg_powers.dm
	code/modules/admin/verbs/adminhelp.dm
	code/modules/economy/EFTPOS.dm
	code/modules/mob/living/silicon/robot/life.dm
 2015-11-30 22:44:55 -05:00
Aurorablade
09dbf83bef Treasure tweaks 2015-11-30 22:43:58 -05:00
Tastyfish
280fc65938 added cancel to more powers, hand tele, cleanups to others 2015-11-30 22:30:57 -05:00
Tastyfish
897313844b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into inputfix 
Conflicts:
	code/modules/mob/living/silicon/robot/life.dm
 2015-11-30 21:54:22 -05:00
TheDZD
6ed7724946 Merge pull request #2691 from Fox-McCloud/radiation-nerf 
Rad Sickness Fix
 2015-11-30 21:46:00 -05:00
Fox-McCloud
f215983fc5 fix not balance 2015-11-30 21:37:41 -05:00
Fox-McCloud
0bbd8ea8d2 Botany QoL Changes 2015-11-30 20:03:59 -05:00
TheDZD
aca9cf1650 Merge pull request #2694 from tigercat2000/fixes 
Borg death fixes, human cleanup, carbon life tweaks
 2015-11-30 19:46:54 -05:00
TheDZD
ff415212bf Merge pull request #2686 from ZomgPonies/nations22 
Nations 2.2 -- Bookkeeping Boogaloo
 2015-11-30 19:22:04 -05:00