cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-20 15:21:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,527 Commits 26 Branches 2 Tags
288af9f92cb15d93b0956a8b32b2f47ebb0dfd93
Commit Graph

821 Commits

Author SHA1 Message Date
Aurorablade
7a99d8fe74 Crazy Fethas Traitor Emporium of Horrors 2016-04-27 19:09:21 -04:00
Fox McCloud
110958860b Merge pull request #4270 from FlattestGuitar/foamforce 
Ports /tg/ FOAM FORCE
 2016-04-27 11:43:55 -04:00
Mieszko Jędrzejczak
9f8a8cef9b Grammar and that weird proc. 2016-04-27 10:56:04 +02:00
Mieszko Jędrzejczak
d35248366a Thingies don't embed, icons work. 2016-04-26 11:30:52 +02:00
TheDZD
18a63c788d Merge pull request #4267 from tigercat2000/CRAZY_HUDS_AMIRITE 
-tg- HUD styles
 2016-04-25 19:57:59 -04:00
Mieszko Jędrzejczak
0f7be5576f Gunshot sounds, uplink references, less spammy tommygun, fixes 2016-04-25 11:32:48 +02:00
Mieszko Jędrzejczak
03c173aeaf Lowers costs, adds darts to autolathe 2016-04-24 09:19:03 +02:00
Fox-McCloud
e9010971bf Fixes Several Injections 2016-04-23 03:45:29 -04:00
Mieszko Jędrzejczak
c96712cbf7 Adds the ability to pick up all ammo from a turf using a magazine 2016-04-22 23:35:56 +02:00
Mieszko Jędrzejczak
5cf3f25892 Ports /tg/ Foam Force guns 2016-04-22 23:35:55 +02: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
TheDZD
d95102b007 Merge pull request #4158 from Fox-McCloud/killer-tomato 
Killer Tomatoes Live Up to their Name
 2016-04-14 19:12:34 -04:00
Fox-McCloud
399813b36c Killer Tomatoes Live Up to their Name 2016-04-11 00:12:24 -04:00
Tastyfish
7d259d35c7 Ports SNPCs 2016-04-09 00:10:01 -04:00
Tigercat2000
bb5e3bca63 Fix remaining issues and sound shit 2016-04-05 16:26:11 -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
Tigercat2000
519992b5a9 Merge branch 'byond510' 
Conflicts:
	.travis.yml
	code/game/jobs/access.dm
	code/game/machinery/camera/camera.dm
	code/game/machinery/flasher.dm
	code/game/machinery/vending.dm
	code/game/objects/items/devices/laserpointer.dm
	code/game/objects/items/weapons/grenades/flashbang.dm
	code/game/objects/items/weapons/tools.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/bees.dm
	code/modules/nano/modules/virus2_creator.dm
	code/modules/virus2/disease2.dm
	code/modules/virus2/diseasesplicer.dm
	paradise.dme
 2016-04-01 14:15:44 -07:00
TheDZD
c00b89e2af Merge pull request #3805 from Fox-McCloud/science-nerf 
Heavily Rebalances Science
 2016-03-10 19:16:38 -05:00
Fox-McCloud
3ac2f23377 Heavily Rebalances Science 2016-03-09 02:58:05 -05:00
TheDZD
4e47626af7 Merge pull request #3767 from Tastyfish/silence 
Tranquillité, Prospérité & Mimeré
 2016-03-08 19:32:29 -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
TheDZD
4b610d8dda Merge pull request #3758 from Fox-McCloud/remove-halloss 
Removes Halloss
 2016-03-05 22:39:19 -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
Fox-McCloud
4d9627e986 Removes Halloss 2016-03-03 23:26:41 -05:00
Crazy Lemon
7e8a2ff237 Merge pull request #3732 from Fox-McCloud/sleeping-carp 
Adds Sleeping Carp Scroll to Uplink
 2016-02-29 06:36:28 -08:00
Tigercat2000
976887b2e0 Replace text2list and list2text 2016-02-28 12:07:19 -08:00
Fox-McCloud
84def6e144 Adds Sleeping Carp Scroll to Uplink 2016-02-28 02:08:32 -05:00
Tastyfish
aed9859b9a Fixes a bunch of things to not circumvent SetStun/SetWeaken/SetParalyse that has no business doing so. 2016-02-28 01:11:36 -05:00
Aurorablade
9a804ebd31 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-24 06:27:16 -05:00
Crazylemon
da01814113 Completely tears out all uses of the 'update_icon' var in mobs 2016-02-23 21:55:03 -08:00
Aurorablade
d861d86edd halp 
open handed cavity item removal not working, help_shake_act seems to be
taking priotity, debrained sprite not appearing right on brain removal
 2016-02-21 23:55:47 -05:00
Regen
097914386f Adds item state 
Also removed extra whitespace
 2016-02-21 23:02:56 +01:00
Regen
f4ba151d33 oops 
it's plasmatech, not plasma
 2016-02-21 14:22:25 +01:00
Regen
8a6bedd028 Fixes 
Fixes typo in the gun sprite, adds origin_tech and tweaks charge cost
 2016-02-21 14:19:18 +01:00
Regen
2db5fec54a Adds immolator laser gun 
Adds an immolator laser gun, which has 7 shots and ignites the target.
http://puu.sh/nfys1/b381d812de.png

Will add more and better pictures tomorrow, but right now I need sleeps
 2016-02-21 03:26:44 +01:00
Aurorablade
570dd619b7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-18 19:01:41 -05:00
Aurorablade
29293dde10 look ma no brain 2016-02-17 22:03:02 -05:00
Fox-McCloud
f47131fbb2 Refactors Bot Weapon Identification 2016-02-12 14:52:50 -05:00
Aurorablade
545d3abf19 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-11 18:03:09 -05:00
Fox-McCloud
0561987ed8 Kinetic Accelerators Auto-Reload 2016-02-09 02:21:19 -05:00
VampyrBytes
18d7335f4e Fixes #3497 
Deathsquad pulse rifle now fires correct round type
 2016-02-04 17:45:00 +00:00
Aurorablade
0fc841f0f9 can i sleep uyet 2016-02-03 00:40:10 -05:00
Aurorablade
6001f3d80c ayyy merge conflicts fix 2016-02-02 20:46:38 -05:00
Aurorablade
25876fd036 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-02 15:35:54 -05:00
Fox-McCloud
1ff23cd3ca lesser summon guns, wizman update 2016-01-29 09:12:37 -05:00
Aurorablade
53f410272a home streach. 2016-01-26 20:53:13 -05:00
Aurorablade
42d8ac68b5 xeno organ fail still... 2016-01-22 22:01:24 -05:00
Fox-McCloud
31cf368706 Fixes Holstering a Few Guns 2016-01-20 18:39:45 -05:00
TheDZD
b1e6f7c0a8 Merge pull request #3157 from DaveTheHeadcrab/blueshitgun 
Blueshield: Advanced Stun Revolver
 2016-01-16 23:17:54 -05:00