cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-08 16:41:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,694 Commits 26 Branches 2 Tags
3f72596e62eb7313a11bb02ffe78e481a3efddef
Commit Graph

19183 Commits

Author SHA1 Message Date
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
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
TheDZD
42845228bb Merge pull request #2684 from Tastyfish/nanomaps 
fixed nanoui maps positioning stuff wrong, atmos control having any alarms
 2015-11-30 19:19:44 -05:00
ZomgPonies
c1a5f41680 Derp 2015-11-30 15:42:26 -05:00
ZomgPonies
5094a85160 Gives mechas speech bubbles. 2015-11-30 15:14:52 -05:00
Tigercat2000
b474b72ce5 Borg death fixes, human cleanup, carbon life tweaks 2015-11-30 07:16:35 -08:00
Aurorablade
2f28c537c4 Removes Null 2015-11-30 07:46:06 -05:00
Fox-McCloud
a3f7fe2c00 removed max() 2015-11-30 02:15:46 -05:00
Aurorablade
8b39fa3bb1 Fixes custom enemy communications 2015-11-30 01:25:12 -05:00
Tastyfish
b2abdd34c1 added input cancelling to pda msg, chemmaster ops, borg mod selection 2015-11-30 01:06:21 -05:00
Tastyfish
1627c6b124 made AI tracking cancel-able, fixed folder labelling 2015-11-30 01:06:21 -05:00
Tastyfish
e2f67a4260 fixed various inputs to be cancel-able 2015-11-30 01:06:20 -05:00
Tastyfish
e562d9d0c2 added input cancelling to pda msg, chemmaster ops, borg mod selection 2015-11-30 01:00:15 -05:00
ZomgPonies
6988ea6624 Missing brackets 2015-11-29 23:25:32 -05:00
Fox-McCloud
4b35bdb3fa Rad Sickness Nerf 2015-11-29 21:26:26 -05:00
ZomgPonies
172cdef1cc Typo fix 2015-11-29 20:27:46 -05:00
ZomgPonies
a765d4587b Add the ability to choose a heir and for heir to takeover 2015-11-29 19:52:31 -05:00
Tastyfish
57ae7e1c9a made AI tracking cancel-able, fixed folder labelling 2015-11-29 19:40:23 -05:00
SvartaSvansen
528ad01873 The non-Vox are taking all the Vox socks! 2015-11-29 18:58:00 -05:00
ZomgPonies
127e0027e8 Clean up procs 2015-11-29 18:55:49 -05:00
Tastyfish
340068a25a fixed various inputs to be cancel-able 2015-11-29 18:30:30 -05:00
ZomgPonies
9dca503d5b Ability for leaders to pick rank names for themselves and members 2015-11-29 18:30:02 -05:00
Tastyfish
559491810a fixed nanoui maps positioning stuff wrong, atmos control having any items 2015-11-29 17:50:17 -05:00
ZomgPonies
958c1dfcda Added one-time ability for leaders to rename nation 2015-11-29 17:29:15 -05:00
ZomgPonies
bb470d2955 Kickoff Nation leader picking 2015-11-29 16:56:11 -05:00
TheDZD
a915a5a0fb Merge pull request #2675 from Fox-McCloud/dwarves 
Re-Adds Dwarf Mutation
 2015-11-29 15:35:06 -05:00
TheDZD
6a558196ca Merge pull request #2678 from Fox-McCloud/mob-faction-fixes 
Simple Animal Faction Fixes
 2015-11-29 15:34:58 -05:00
TheDZD
a2f6204a8b Merge pull request #2679 from Fox-McCloud/cash-update 
Small Cash Update
 2015-11-29 15:34:48 -05:00