cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-22 16:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,267 Commits 26 Branches 2 Tags
0d627d321393670d0406d49b4e3d66ce8c4bcadc
Commit Graph

393 Commits

Author SHA1 Message Date
Fox McCloud
695cde670a Merge pull request #4515 from TheDZD/why-did-i-try-doing-this-again 
Major Gun Refactor
 2016-06-08 22:49:10 -04:00
Tastyfish
b787e599ef Fixes loot crate multitooling 2016-06-02 16:30:29 -04:00
TheDZD
f7d4cbe108 Fixes paths, snipers, turrets, mechas, some other things. 2016-05-31 22:50:59 -04:00
HugoLuman
c6b0494f31 All lazarus'd mobs can be pet collared 
If you revive a mob with a lazarus injector, you will now be able to rename it with a pet collar if it couldn't be before.
 2016-05-25 23:02:42 -07:00
SamCroswell
1bf59c22ef Bows Down to Overlord DZD 2016-05-22 16:28:23 -04:00
TheDZD
6560ec9bc6 Merge pull request #4380 from Fox-McCloud/simple-animal-damage 
Simple Animal Damage Fix+Change
 2016-05-09 21:23:50 -04:00
TheDZD
85a583f126 Merge pull request #4287 from Fox-McCloud/science-update-II 
Science Rebalance Round II
 2016-05-08 13:02:04 -04:00
Fox-McCloud
b6ef174c07 Simple Animal Damage Fix 2016-05-07 01:28:11 -04:00
IK3I
6035615cab Turns out loops need to be initialized.... 2016-05-06 18:25:02 -05:00
IK3I
a96f9e4360 Fixes Decalocks in abandoned crates 
-also adds some string based recursion helpers
 2016-05-06 17:58:45 -05:00
TheDZD
18a63c788d Merge pull request #4267 from tigercat2000/CRAZY_HUDS_AMIRITE 
-tg- HUD styles
 2016-04-25 19:57:59 -04:00
Fox-McCloud
d546d4efd8 Science Rebalance Round II 2016-04-25 04:07:49 -04:00
Tigercat2000
0f70e6810b -tg- OOP Hud Refactor 
- Added 4 new HUD styles
 - Humans recreate their hud if they change their UI pref mid-game
 - Refactored how objects are added to the client screen
 - HUD's are now handled by subtype and mob/proc/create_mob_hud()
 - HUD visibility is no longer chained directly to the F12 button, it's a proc on HUD datums now
 - Mobs only create/destroy their HUD when necessary, not every Login()
 - Destroyed aim-mode, it didn't work and I couldn't make it work.
 - Renamed all of the screen1_x.dmi files to screen_x.dmi
 - Removed screen1.dmi, screen_gen.dmi now handles generic icons.
 2016-04-21 20:28:08 -07:00
Fox-McCloud
1c99344d16 derp 2016-04-21 21:51:53 -04:00
Fox-McCloud
ab16128e7c Updates Mining Loot Crates 2016-04-21 21:37:13 -04:00
Tastyfish
178912db73 Makes the startup time significantly faster 2016-04-16 00:58:20 -04:00
TheDZD
341034e37d Refactors hostile mob code, unsnowflakes bears, panthers, and snakes 
Also fixes some bee stuff.
 2016-04-14 20:36:45 -04:00
Fox-McCloud
5e1fa7f8e2 Mining Bot Updates 2016-04-10 22:15:36 -04:00
Fox-McCloud
3f7f6704c8 Xenobio Refactor/Changes 2016-04-06 01:37:04 -04:00
Tigercat2000
c72cc9606e Merge remote-tracking branch 'upstream/master' into to_chat 
Conflicts:
	code/modules/research/xenobiology/xenobiology.dm
 2016-04-05 15:54:48 -07:00
Tigercat2000
78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000
9d430844c3 Replace most (if not all) output << operators with to_chat(user, message) 
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
 2016-04-05 08:15:05 -07:00
Tastyfish
16c8e24f04 Tweaks/fixes some bot radio/language stuff, lazarus capsules 2016-04-04 02:02:19 -04:00
Tastyfish
6a8ea815b2 Merge branch 'master' into buttbots2 
Conflicts:
	code/defines/procs/AStar.dm
	code/modules/mob/living/simple_animal/bot/cleanbot.dm
	code/modules/mob/living/simple_animal/bot/medbot.dm
	paradise.dme
 2016-03-31 13:33:46 -04:00
Fox McCloud
d1765e0e14 Merge pull request #4019 from tigercat2000/disease1 
-tg- disease1
 2016-03-30 21:29:58 -04:00
Tigercat2000
25fa8ea2c9 viro consoles 2016-03-29 19:15:17 -07:00
Fox-McCloud
c2fe562ad2 Puke Fix 2016-03-28 22:39:53 -04:00
Tastyfish
25195208a9 Ports tg simple_animal bots 2016-03-28 00:22:04 -04:00
TheDZD
df8073f12e Merge pull request #3851 from Fox-McCloud/xeno-fixes 
Facehugger and Embryo Fixes
 2016-03-12 11:29:45 -05:00
Fox-McCloud
0dc0ada004 Facehugger and Embryo Fixes 2016-03-12 03:00:54 -05:00
monster860
f6ccfc9ae7 Merge branch 'master' into fuckyougit 2016-03-11 06:17:16 -05:00
monster860
f4191293eb Spesspod Mining Laser - Fuck You Git edition 2016-03-10 21:24:21 -05:00
TheDZD
4e47626af7 Merge pull request #3767 from Tastyfish/silence 
Tranquillité, Prospérité & Mimeré
 2016-03-08 19:32:29 -05:00
Fox McCloud
bb4626e8ce Merge pull request #3782 from Spacemanspark/I-dont-think-Satoshi-Tajiri-intended-for-this 
Adds Lazarus Injector emag_act()
 2016-03-08 13:28:22 -05:00
Spacemanspark
c98cda3f55 Re-adds emp_act() to go alongside emag_act() 2016-03-07 19:54:39 -06:00
Spacemanspark
80f3b56318 Changes Lazarus Injector's emp_act() to an emag_act() 2016-03-07 11:18:02 -06:00
Fox-McCloud
488af2ac7a Gives Mining Drills and Edge 2016-03-06 04:33:21 -05:00
Tastyfish
d189d70f4a Adds tranquillite 
Changes Recitence to be approx on par with Honker
Adds invisible wall barrier
 2016-03-06 01:49:30 -05:00
Fox McCloud
ab490f7fd9 Merge pull request #2903 from Aurorablade/OrganRefactor 
[HOLY SHIT!]Charlie, lets go to candy mountain, charlie
 2016-03-04 19:51:50 -05:00
Aurorablade
9a804ebd31 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-24 06:27:16 -05:00
Crazylemon64
ba45bfff64 Ore satchels now work equipped in any "body" slot 2016-02-23 23:47:43 -08:00
Crazylemon64
343bbb28c1 Miners can now collect ore by walking on it while having an ore satchel on 2016-02-23 06:30:03 -08:00
Tastyfish
63048c7492 Fixes some spelling grammar errors 2016-02-22 04:11:04 -05:00
Crazylemon64
bc2e01349f Drilling the ground makes noise, and the fuel generators work off ore too now 
You can also load your generators straight from the ore box, but this will be highly inefficient, as the ore reclaimer will be able to multiply the materials
present by a large factor
 2016-02-19 17:51:15 -08:00
Crazylemon
7c3c27dde2 RIPLEY should now be able to actually drill for sand 2016-02-19 14:25:23 -08:00
Crazylemon64
93f5d97eed Mining drones will now collect sand 2016-02-19 10:57:57 -08:00
Aurorablade
545d3abf19 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-11 18:03:09 -05:00
Spacemanspark
5aa671b630 Fixes indents. 2016-02-09 01:41:22 -06:00
Spacemanspark
b6b3204bf7 Makes Mob Capsule code better. 2016-02-09 01:02:25 -06:00
Spacemanspark
24afe14a12 Adds in mob capsules 2016-02-08 23:40:53 -06:00