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
13,257 Commits 26 Branches 2 Tags
41c8e8fe3f02c14cd9900711ce49e5cf0cd5bcbd
Commit Graph

1405 Commits

Author SHA1 Message Date
cib
b0cabba481 Fixed a severe bug with robot components. 
There were several desyncs between robot.cell and robot.components["power cell"].installed, leading to very annoying bugs.
 2013-06-25 15:00:58 +02:00
SkyMarshal
aa85e757d4 Added a better framework for multi-tile doors, pulling works strangely though. 2013-06-24 17:21:55 -07:00
Segrain
f97f3596a6 Punctuation fix. 2013-06-24 12:03:47 +03:00
Segrain
0d6e49742a Typo fix. 2013-06-24 06:06:00 +03:00
Segrain
65731b232b Quickfix and changelog. 2013-06-23 20:52:19 +03:00
Segrain
7fec5309f7 Airlock construction update. 2013-06-23 20:42:58 +03:00
Segrain
1f7d39d99f Stacks update. 2013-06-23 20:31:55 +03:00
Chinsky
b4822e1600 Merge pull request #3126 from CIB/bleeding-edge-freeze 
Implemented robot components(organs)
 2013-06-22 22:58:04 -07:00
meyar
6f84917a58 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-23 00:17:13 -04:00
Zuhayr
be16c8eff3 Fixes #2957 2013-06-22 20:07:21 -07:00
cib
b58326c8fa Implemented robot components(organs) 
Features:
- You now have to open up a cyborg after constructing it and insert all the components
- Cyborgs have per-component damage rather than total damage.
- Too much damage can fry a component, making it non-functional
- Components consume power
- You can disable a component to save power
- Actuator component allows you to move
- Camera component allows you to see
- Comms component allows you to use :b
- Radio component allows you to use radio
- The same placeholder icon for all components
 2013-06-22 07:11:02 +02:00
Zuhayr
a16c8e0595 Fixes #3081 2013-06-21 18:00:25 -07:00
Spamcat
0dfb5a0583 Whoops :/ 2013-06-19 02:58:26 +04:00
Spamcat
6d6becbeed Made hailers emaggable. 2013-06-19 02:35:32 +04:00
Zuhayr
63b3e44b5c Bug fixes for embedding/pinning code. 2013-06-18 21:24:26 -07:00
Zuhayr
b1cac56e9a Merge resolution. 2013-06-15 03:54:22 -07:00
Jamini
89766706fe Alien Monkeys - Farwa, Stok, Aenera 
Signed-off-by: Jamini <mobiousjami@gmail.com>
 2013-06-14 02:22:27 -04:00
Zuhayr
6b73b8ec2f Adjusted kitchen knives. Added projectile pinning. Various tweaks. 2013-06-13 20:46:09 -07:00
Zuhayr
7cd54ac387 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-12 11:41:08 -07:00
Zuhayr
0a220db976 Added embedded weapons and adjusted implant removal surgery to work with non-implants in organs. 2013-06-12 00:28:12 -07:00
Zuhayr
d0e15b3608 Harpoon, harpoon sprites, removed pneumatic cannon sprites from human.dmi. 2013-06-11 13:15:33 -07:00
Chinsky
09d0bb7f8e Merge pull request #3039 from Furlucis/master 
Typo fixes
 2013-06-11 12:21:16 -07:00
Spamcat
076f4c9d9a Figured I should finally commit it, since exams are over now~ 
Radios start off by default. Should decrease the amount of tcomm lag.
 2013-06-11 23:09:44 +04:00
Furlucis
360bde9f83 Fixed some typos. (feotal, "/red ...") 
Signed-off-by: Furlucis <Logman115@gmail.com>
 2013-06-11 15:01:48 -04:00
Zuhayr
bc2db268cc Vox oxygen toxicity, vox breath mask, nitrogen tank for spawning. 2013-06-10 17:16:54 -07:00
jack-fractal
29bffb0c20 Merge branch 'master' into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
 2013-06-06 21:32:08 -04:00
jack-fractal
17b8a2dc8a - reverting a change I hadn't accounted for to the luminosity of the PDA's flashlight 2013-06-06 20:50:22 -04:00
jack-fractal
f4441b5019 refactoring the Stat function for silicon lifeforms 
adding messenger functions to cyborgs and refactoring the AI's IM system
 2013-06-06 20:46:46 -04:00
Zuhayr
df75d25cb3 Map conflict, using BEF. 2013-06-06 10:40:22 +09:30
Chinsky
57c1ebb285 Merge pull request #2977 from MagmaRam/master 
Fix for security belts not holding all seven items sometimes
 2013-06-05 06:21:47 -07:00
MagmaRam
ae697179c9 Fix for security belts not holding all seven items if the total combined w_class of the items is over 14. They should now be able to hold seven of any items that fit in them. 2013-06-05 20:14:11 +07:00
Zuhayr
9e71180e1b Merge conflict resolution, using BEF. 2013-06-05 14:22:04 +09:30
meyar
11ae345509 Nerfs the PDA flashlight to make the ACTUAL flashlight a viable option. 2013-06-04 18:34:43 -04:00
Aranclanos
799ed74a3c Made the effects of EMP pulses get garbage collected. Less lag on the singularity (around 20 effect del per 5~10 seconds) 2013-06-04 13:47:26 +04:00
Chinsky
63f9549596 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into whistle 
Conflicts:
	baystation12.dme
 2013-06-01 17:12:51 +04:00
MisterBook
606a510168 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
 2013-05-31 22:58:01 -05:00
Furlucis
24098c6529 UNadded robotic hands and feet because there was no point in doing this in the first place. 
Signed-off-by: Furlucis <Logman115@gmail.com>
 2013-05-31 22:32:39 -04:00
Furlucis
e32b253a41 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-05-31 20:01:57 -04:00
MisterBook
06b7700086 Cobpipe fix 
Smoking pipe icon fix.
Eye-stab admin logging fix.

Tasers now do halloss, representing non-lethal PAIN.
http://baystation12.net/forums/viewtopic.php?f=5&t=7773

Tasers now check their target's limb for armor, and deflect if armored (Represented by coeffecient = 0).
http://baystation12.net/forums/viewtopic.php?f=5&t=7772
 2013-05-31 00:09:00 -05:00
Segrain
3409e1f05d Toolbelts can hold engineering tape. 2013-05-30 19:35:03 +03:00
Segrain
50f05f7a11 Pill bottles can hold paper. 
For prescriptions and such.
 2013-05-30 19:28:34 +03:00
Chinsky
d45073a5ab Added new item - hailer. Use in hand to make it say HALT! SECURITY! 
Should help in asking people to halt while running.
 2013-05-28 03:12:58 +04:00
Furlucis
08524aa4d2 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-05-27 01:48:44 -04:00
cib
cab1289511 Merge branch 'master' of github.com:Baystation12/Baystation12 
Conflicts:
	html/changelog.html
 2013-05-26 20:43:22 +02:00
Chinsky
13e2d8d793 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
 2013-05-26 05:02:07 +04:00
meyar
1d5d7cb901 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-05-24 06:52:03 -04:00
meyar
c1e701f32b Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
 2013-05-24 05:23:36 -04:00
Kilakk
ef2c7af6a0 Telescopic baton message fix. 
Fixed first- and third- person extend/collapse messages for the
telescopic baton, woo
 2013-05-23 16:24:53 -04:00
cib
b5217d862a A few fixes to rp-rev 
- Name was empty, hopefully using real_name fixes that
- Announcements coming too quickly
- Fixed icon path issue
 2013-05-23 22:12:20 +02:00
cib
ce19719700 Fixed two problem with airlock/APC commit: 
- Debugger now sends messages to user instead of usr(whoops)
- Can now close emagged door with crowbar so you can take out circuit
- Couldn't weld emagged doors
- Replacing the circuitry should now be sufficient to fix an emagged door.
 2013-05-23 19:47:33 +02:00