cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-04 14:42:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,767 Commits 26 Branches 2 Tags
be0db9984b9ad40cd2315529554fc20f7b7dfd3b
Commit Graph

3197 Commits

Author SHA1 Message Date
AffectedArc07
a896bc825f [TGUI] Camera Consoles (Actual Magic) (#13750) 
* TGUI Camera Consoles

* inb4 I fail my own CI routines

* Makes it so AIs cant use cam consoles

* Refactors camera bugs
 2020-09-19 09:55:33 -04:00
AffectedArc07
ce2f0d401d Swings the axe on modular consoles (#14355) 
* Swings the axe on modular consoles

* Experience will not save you in these parts
 2020-09-19 09:36:56 -04:00
dearmochi
101ad5b617 Ports security webbing from /tg/ (#14354) 
* Ports security webbing from /tg/

* Can only be purchased from cargo (15 pts for 3)
 2020-09-18 18:53:42 -04:00
mochi
b02c41ba63 Merge branch 'master' into my-nanomaps-cant-be-this-cute 2020-09-18 20:27:23 +02:00
farie82
229cf3e344 Martial arts rework/refactor. And you can't prepare combos now. Arts tied to the mind (#13341) 
* first commit. combos, CQC started

* CQC working

* All transfered to new system

* The actual bug fix

* add time in between combos

* time between combos limit and minor explaination tweak

* Krav maga fixes, time change. Minor text changes

* Move martial_art to mind

* Merge mistake fixed

* Steels review changes
 2020-09-18 11:07:19 -04:00
Qwertytoforty
f6b8fe5547 Makes CNS rebooter stun on EMP (#14234) 
* Makes CNS rebooter stun on EMP

* Kyets requests

Co-authored-by: Qwertytoforty <qwertytoforty@gmail.com>
 2020-09-18 10:44:38 -04:00
farie82
8e8ad65906 Makes most targeted spells select a target on click with a radius (#13220) 
* Basis

* Make most targeted spells use a click with radius instead of a list

* Fixes

* Selection code

* return ..()

* Auto targeting

* Forgot a comment change

* Merge issue fix
 2020-09-18 10:30:32 -04:00
mochi
976642ddcd Merge branch 'master' into my-nanomaps-cant-be-this-cute 2020-09-18 11:09:26 +02:00
mochi
d55716824c Add brackets, use proper command globals 2020-09-18 11:05:50 +02:00
mochi
fbc728f01a Better bolding 2020-09-17 23:19:34 +02:00
mochi
d2780648cf Fix atmos control not refreshing data correctly 2020-09-17 23:03:08 +02:00
mochi
5e74a76362 Merge branch 'master' into my-nanomaps-cant-be-this-cute 2020-09-17 22:20:49 +02:00
mochi
888ac72650 Refactor NanoMaps, TGUI Crew Monitor 2020-09-17 22:18:57 +02:00
Kugamo
55249e2862 Adding wearability to fried vox trash (#13978) 
* code to add head wearing functionality to fried vox trash
 2020-09-16 18:58:00 -04:00
farie82
915e0913a9 Make spell buttons light up slowly when recharging (#13200) 
* Make spell buttons light up slowly when recharging

* Recharge percentage

* whoops
 2020-09-16 15:41:02 -04:00
AzuleUtama
8cf7051cb9 Energized fire axe rework (#13907) 
* Energized axe reworked and now subtype of regular axe
 2020-09-16 15:36:39 -04:00
AffectedArc07
90fd9a8fb8 Removes all relative heresy (#13969) 
Removes all relative heresy
 2020-09-16 12:52:20 -04:00
variableundefined
d9a8da98bb Merge pull request #14028 from SteelSlayer/spawn-removal 
Some spawn removals and other assorted code cleanup
 2020-09-16 11:47:59 -04:00
AffectedArc07
cafe92f93b Fixes duct tape exploit (#13985) 
* Fixes duct tape exploit
 2020-09-16 11:34:18 -04:00
SteelSlayer
dab29cc668 Merge remote-tracking branch 'upstream/master' into spawn-removal 2020-09-16 09:38:20 -05:00
denghis1
845e7a8b75 Added the warning cone as a headpiece for Ian (#14216) 
* Added the warning cone as a headpiece for Ian
 2020-09-16 09:52:40 -04:00
joep van der velden
0bfe9d994e Merge remote-tracking branch 'upstream/master' into bombing-logging-and-co 2020-09-16 15:26:19 +02:00
variableundefined
1d5358f79b Merge pull request #14215 from AffectedArc07/removes-omni-atmos 
Removes omni gas devices
 2020-09-15 22:27:42 -04:00
AffectedArc07
9470e34aed Merge remote-tracking branch 'ParadiseSS13/master' into pr/TDSSS/14101 2020-09-15 20:01:16 +01:00
variableundefined
701972fc67 Merge pull request #13914 from Kyep/winter_dome_remove_cap_laser 
Updates to lavaland winter biodome
 2020-09-15 14:52:18 -04:00
Kyep
ec8b67b2c3 fixes merge conflict 2020-09-14 18:59:14 -07:00
variableundefined
3a3ff1400a Merge pull request #13447 from EMPlight/BulldogXLmag 
Adds Bulldog extended drum mags and bundle for nuke ops.
 2020-09-14 16:45:04 -04:00
mochi
f1b7e9f7cc please just end my life 2020-09-14 20:15:09 +02:00
mochi
e07306f20d Merge branch 'master' into instrument-tgui-n-optimization 2020-09-14 20:04:48 +02:00
mochi
fa9eb84c8b Address AA 2020-09-14 19:58:18 +02:00
SteelSlayer
2a70626c78 affected review tweaks 2020-09-14 11:38:17 -05:00
SteelSlayer
6caf4cfebf Merge remote-tracking branch 'upstream/master' into wires-tgui 2020-09-14 08:51:32 -05:00
AffectedArc07
a2c5fc39a8 Merge pull request #13751 from Fox-McCloud/alarm-overhaul 
Overhauls and Refactors Alarm System
 2020-09-14 13:54:06 +01:00
AffectedArc07
ac0a9b7ba7 Merge pull request #14145 from TDSSS/armory-shuttle 
New admin shuttle template: Armory shuttle
 2020-09-06 11:13:01 +01:00
AffectedArc07
47aeac7954 Merge pull request #14149 from Nazsgull/extraSpessRuins 
Adds extra spess ruins
 2020-09-06 11:07:09 +01:00
Certhic
d0c2feff2b uplink runtime fix 2020-09-04 10:05:31 +02:00
AffectedArc07
91b40eab92 Removes omni gas devices 2020-09-02 11:49:45 +01:00
awdaw
7d6eb503ba Update space.dm 
Fixes an oopsie I did with an extra L at allow_duplicates
 2020-08-31 16:29:12 +02:00
awdaw
ddf9fd2081 Update space.dm 
Removes default values, disables duplicates for the syndiecakes factory
 2020-08-31 16:13:17 +02:00
awdaw
4cc3053660 Update space.dm 
Removes redundant definitions that default to the values I was using.
 2020-08-30 23:13:54 +02:00
awdaw
5209c64cfe Removes the maze and variations from maps and space.dmm 
Might come back in other PR as away missions but for now they need a revision...
 2020-08-30 01:47:17 +02:00
variableundefined
5d0b64b0c9 Merge pull request #14087 from AffectedArc07/removes-butterfly-crate 
Nerfs butterfly crate
 2020-08-28 14:16:58 -04:00
AffectedArc07
ebba3a322b Merge pull request #13703 from Fox-McCloud/tg-flying-floating-float-refactor 
TG Flying+Floating Refactor
 2020-08-27 20:08:35 +01:00
AffectedArc07
727076cbbb Merge pull request #14135 from farie82/logviewer-tweaks 
Log viewer tweaks. Performance improvements. Record searching limit. And some fixes
 2020-08-26 20:39:54 +01:00
SteelSlayer
1b9ef55246 Merge remote-tracking branch 'upstream/master' into wires-tgui 2020-08-25 16:36:13 -05:00
awdaw
9e02300e7d Uses inheritance 
Since all of these fields are retrieved from the parent, they are no longer necesary at the childs.
 2020-08-25 21:29:20 +02:00
awdaw
8c076c5f17 Fix maze multispawn 
Avoids multiple versions of the maze to spawn at the same time by making one of them parent and the others its children.
 2020-08-25 21:27:33 +02:00
TDSSS
19dcb033c3 Initial commit 2020-08-25 20:19:25 +02:00
awdaw
bcd58ef003 Fizes a typo in the filename declaration 2020-08-25 01:26:39 +02:00
awdaw
d79776ce58 Update space.dm 
Adds mazeA, B and C to the map list.
 2020-08-25 00:09:54 +02:00