cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-03 06:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,982 Commits 26 Branches 2 Tags
3acff9ccff66856b2bd6f468e100b7e60d4bb51a
Commit Graph

2925 Commits

Author SHA1 Message Date
ZomgPonies
3acff9ccff Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into russian 2015-12-20 06:29:28 -05:00
Fox-McCloud
ea11eaa387 Ports Wormhole Projector 2015-12-19 00:57:40 -05:00
Fox McCloud
4c03cf2599 Merge pull request #2797 from Aurorablade/HudRefactor 
[Ready for Review][WTF]Hud refactor
 2015-12-18 21:13:21 -05:00
Fox McCloud
b91e95120f Merge pull request #2869 from KasparoVy/master 
Adds Vulpkanin Species Flag
 2015-12-18 04:57:24 -05:00
TheDZD
f12675b248 Merge pull request #2866 from Fox-McCloud/rapid-construction 
Ports Rapid Construction for Part Replacer
 2015-12-17 23:35:26 -05:00
Aurorablade
ccd6d2641b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HudRefactor 2015-12-17 22:43:09 -05:00
KasparoVy
f4b3afff5b Tajara back to Tajaran 2015-12-17 16:57:12 -05:00
Tigercat2000
e014f4a1b6 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT 2015-12-17 07:26:41 -08:00
KasparoVy
4453239421 Adds Vulpkanin Species Flag 
Adds the Vulpkanin species flag to the cargo vendor, and fixes a couple
typos in the item descriptions.
 2015-12-17 04:29:17 -05:00
Fox-McCloud
c83a36aa21 Ports Rapid Construction for Part Replacer 2015-12-16 23:42:39 -05:00
Fox-McCloud
80e2676e0c medbot fixes and tweaks and features 2015-12-16 00:02:18 -05:00
Fox-McCloud
7a766067ee typo 2015-12-15 22:11:00 -05:00
Fox-McCloud
6105699160 More Medbot Skins 2015-12-15 20:02:29 -05:00
TheDZD
8d0c71e3cb Merge pull request #2832 from Fox-McCloud/action-figure-change 
Action Figure Tweak
 2015-12-14 20:53:56 -05:00
Fox McCloud
3d04e396ed Merge pull request #2825 from Tastyfish/coughsplosion 
Added voice analyzer & Entertainment monitor supporting audible emotes
 2015-12-14 20:47:33 -05:00
TheDZD
ff68ddbf55 Merge pull request #2822 from Fox-McCloud/fixup 
Cell Weight Class and Tech Fixup
 2015-12-14 19:10:41 -05:00
Fox-McCloud
e3965c7e7c derpy fox is derp 2015-12-14 19:07:42 -05:00
Tastyfish
21d04ecfbf removed radio hear_message per fox's request 2015-12-13 20:49:16 -05:00
Fox McCloud
2bcd0dbe3d Merge pull request #2831 from Spacemanspark/NTSAM-focuses-on-too-many-details 
Grammar fixes.
 2015-12-13 20:34:19 -05:00
Fox-McCloud
74e22e2041 Action Figure Tweak 2015-12-13 20:32:12 -05:00
Spacemanspark
1aad24ae4a Grammar fixes. 
@NTSAM
 2015-12-13 19:03:23 -06:00
Tastyfish
d1fa228b19 Fixed hologram hearing, megahones, intercoms&tape recorders picking up emotes in room 2015-12-13 18:29:27 -05:00
Tigercat2000
0e3c1f7fc6 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT 2015-12-13 09:25:04 -08:00
Tastyfish
f39649be57 added hear_message, like hear_talk but for audible emotes, voice analyzer & newscaster support 2015-12-13 04:36:41 -05:00
Tigercat2000
3d71483372 /vg/ / -tg- asset_cache 
Port of -tg-'s port of /vg/'s asset cache
Funny thing is, this actually replaces an old version of /vg/'s asset
cache we already had
IT'S A PORT OF A PORT REPLACING A PORT
POOOOOOOOOOOOOORTCEPTION

Basically, gets rid of the 30-40 second interface lag when you first join,
via *mumblemumble* MAGIC!

Also moves a few nano files around.
 2015-12-12 21:25:04 -08:00
Fox-McCloud
a2d10c4c49 Cell Weight Class and Tech Fixup 2015-12-12 22:40:02 -05:00
Aurorablade
950ae86a92 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HudRefactor 2015-12-10 06:47:43 -05:00
Aurorablade
c590958f2d Hud refactor 2015-12-10 01:01:54 -05:00
Fox McCloud
3151d84904 Merge pull request #2783 from Crazylemon64/all_sheet_related_puns_i_can_think_of_are_vulgar 
Improved Sheet Handling; Better Sci machine resource Formatting
 2015-12-09 18:21:54 -05:00
Fox McCloud
f6e7d30805 Merge pull request #2784 from Crazylemon64/robo_flash_and_console_tracking 
Roboconsole gives loc and health, Drones now flash right
 2015-12-09 17:45:58 -05:00
Crazylemon
5463a92828 Silly typo fix 2015-12-09 13:41:33 -08:00
Tigercat2000
42aa800393 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT 
Conflicts:
	code/game/supplyshuttle.dm
	code/modules/mining/laborcamp/laborshuttle.dm
 2015-12-09 10:08:28 -08:00
Crazylemon
ced3677f8b Removes the stack prompt for grabbing a single item from the stack 
The prompt for transferring items between stacks, however, remains
 2015-12-09 05:29:50 -08:00
TheDZD
55e0ac4507 Merge pull request #2770 from Fox-McCloud/bacpacks-and-stuff 
Backpack Fixes and Port
 2015-12-08 22:00:50 -05:00
Crazylemon64
289d54661c Roboconsole gives loc and health, Drones now flash right 
- Adds health and location readings to the robot control console

- Drones now update status effects, so that flashes don't last forever
 2015-12-08 14:29:56 -08:00
Crazylemon64
7efa8ed13f Sheet handling is much nicer now 
- Nanotrasen fabrication machinery, such as those for space pods and
  exosuits, now have functional ID locks for their respective departments

- Research machinery and the fabricators now allow you to eject a custom
  amount of sheets, so you don't have to spam-click

- Splitting sheets by hand is now done by prompt
 2015-12-08 14:23:48 -08:00
Crazylemon
97f2f91843 Adds handiness to stack ejection 
Also should make the mech fabricator actually require robotics access as
the file would suggest. Here goes nothing
 2015-12-08 10:47:32 -08:00
Fox-McCloud
00800803ff Backpack Fixes and Port 2015-12-07 19:11:24 -05:00
Certh
6bdad2a9d9 The examine line of the safe was broken due to w_class being above 5. Tuned it down to 5 (huge item) 2015-12-07 16:33:44 +01:00
Certh
591daf04d2 Corrected the capitalization of a large amount of machines and items. This will also cause BYOND to use the correct articles (a/an). 
Also corrected some periods, spelling errors etc. along the way.

If this PR seems familiar, a part of this is of an earlier PR that I messed up.
 2015-12-07 16:14:26 +01:00
TheDZD
5984e9049f Merge pull request #2752 from RudiPardieck/master 
Fixes issues with two handed weapon sprites
 2015-12-06 16:00:17 -05:00
Certh
fc3d211aa2 Fixes issues with two handed weapon sprites 2015-12-06 17:15:27 +01:00
Crazylemon64
9241442cc6 Some fixes to robotics surgery 
Internal organ fixing surgery will now work correctly on robotic organs,
using nanopaste in place of trauma kits

Defibs also don't need the body to be past the point of deadness to work

Kitchen utensils should now properly work as surgery tools where given in
code

IPC thralls can now be dethralled by performing the surgery on where their
brain is, in this case their chest. This will also work for any species
that has a brain anywhere else in their body.
 2015-12-05 01:35:59 -08:00
Tigercat2000
c3f476f62c Supply shuttle, initial_move() fixes, dock fixes 
Supply has been almost completely replaced by -tg-'s system.

No fancy UI, unfortunately, but modifying bay's directly was not possible.
 2015-12-04 21:48:40 -08:00
ZomgPonies
62f4f5cf66 Revolver stuff 2015-12-03 23:18:03 -05:00
TheDZD
07021e506b Merge pull request #2699 from Fox-McCloud/botany-qol 
Botany QoL Changes
 2015-12-02 19:15:17 -05:00
Tastyfish
280fc65938 added cancel to more powers, hand tele, cleanups to others 2015-11-30 22:30:57 -05:00
Fox-McCloud
0bbd8ea8d2 Botany QoL Changes 2015-11-30 20:03:59 -05:00
Tastyfish
b2abdd34c1 added input cancelling to pda msg, chemmaster ops, borg mod selection 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